]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/screenshotcmd
authorMario <mario@smbclan.net>
Fri, 17 Jun 2016 08:06:43 +0000 (18:06 +1000)
committerMario <mario@smbclan.net>
Fri, 17 Jun 2016 08:06:43 +0000 (18:06 +1000)
commite64eb040bb832e3f6fe07364271461d1274f958f
tree969d9427d3e6b88a5dfa7837ff0bb69095f919a5
parent4f8ca9cd9fa138061ca5112ca66c3d5fbddf1a03
parentbfc7e0efffa29c2e4937dfc3c4b7219882af7fdb
Merge branch 'master' into matthiaskrgr/screenshotcmd
commands.cfg