]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf3933e ede5abf)
Merge branch 'master' into Mario/mute_bot_warnings
authorMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:11:00 +0000 (12:11 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:11:00 +0000 (12:11 +1000)

Trivial merge