]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit1b7830a7a3d15f361d04d3e552dc09162655da2a
treeca724375496a464de3b5f2dc7313a9b16266b62d
parente03ab4d35ec6bab4bff36833150a8cd957cc0334
parent35f8f68f05c3573ae12ce5dae5d2668a054d8d7b
Merge branch 'master' into matthiaskrgr/hudsetup
qcsrc/server/g_world.qc