]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 6 May 2013 21:44:53 +0000 (07:44 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 6 May 2013 21:44:53 +0000 (07:44 +1000)
commit40eb151be5ea5fca60d5919c7053848a2c7ba248
treecf0ccb71b187dd5317188f60f1174f9a119d670f
parent01e2dd8533c612e52fb6d1577b493d455628bd43
parent55f87426a3f58e4161eae8a7e8523f165cb9da00
Merge branch 'master' into Mario/monsters
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/common/constants.qh