]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80fbcef 8edee15)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 31 Dec 2011 07:28:45 +0000 (02:28 -0500)
committerSamual <samual@xonotic.org>
Sat, 31 Dec 2011 07:28:45 +0000 (02:28 -0500)
1  2 
qcsrc/dpdefs/menudefs.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/dpdefs/menudefs.qc
Simple merge
diff --cc qcsrc/server/cl_player.qc
Simple merge