]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/screenshotcmd
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 8 Feb 2015 12:06:36 +0000 (13:06 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 8 Feb 2015 12:06:36 +0000 (13:06 +0100)
commit4f8ca9cd9fa138061ca5112ca66c3d5fbddf1a03
treeed2992758d9556634b96f71adf01b0659514adc9
parent4592d59da60ff2481f7c2cec2037531af01aeb86
parentf81e89c081178360ed0fd8896e9056cae7a7519c
Merge branch 'master' into matthiaskrgr/screenshotcmd
commands.cfg