]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 14 Sep 2013 08:47:05 +0000 (10:47 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 14 Sep 2013 08:47:05 +0000 (10:47 +0200)
commit46ab0565581b318ba02e7f9e9ddf879e90b8d452
tree04b12e7d6e5378f7e51698e8da454220caefa651
parent1b7830a7a3d15f361d04d3e552dc09162655da2a
parent06ee57203283ee16b27a716619866d0a524b6505
Merge branch 'master' into matthiaskrgr/hudsetup

Conflicts:
qcsrc/common/mapinfo.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/server/g_world.qc