]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 23 Sep 2013 15:18:51 +0000 (17:18 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 23 Sep 2013 15:18:51 +0000 (17:18 +0200)
commit903610018ac85cfa04e1e7072f7efdbd9c4e0413
tree69845c9c7bf3a1f4b25f909c9fe17f2fdc8987f6
parent46ab0565581b318ba02e7f9e9ddf879e90b8d452
parent8e6a61d0dd23c6cbd3dc98fb08b4d0f0c6c9477a
Merge branch 'master' into matthiaskrgr/hudsetup
qcsrc/server/g_world.qc