]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 14 Dec 2012 22:03:33 +0000 (23:03 +0100)
commit9e859300380ab844d091e78992e59ffa215c5883
treed287911382260c6c3c7b744ec60188056f1221d0
parent6e885a9ab9ab19bd761cde1bf8c6a5040acab3c0
parent21669f743378b255e4f984222de65be549fda772
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc