]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Thu, 29 Aug 2013 12:11:26 +0000 (14:11 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Thu, 29 Aug 2013 12:11:26 +0000 (14:11 +0200)
1  2 
qcsrc/server/g_world.qc

Simple merge