]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5fece7 10279a8)
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)
1  2 
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/defs.qh
Simple merge