]> 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: 8f52b69 5d84c65)
Merge branch 'master' into terencehill/ca_fixes
authorterencehill <piuntn@gmail.com>
Thu, 27 Feb 2014 12:21:26 +0000 (13:21 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 27 Feb 2014 12:21:26 +0000 (13:21 +0100)
1  2 
gamemodes.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge