]> 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: 880e27e cf37c1c)
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 3 Dec 2011 17:53:49 +0000 (12:53 -0500)
committerSamual <samual@xonotic.org>
Sat, 3 Dec 2011 17:53:49 +0000 (12:53 -0500)
1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_world.qc
Simple merge