]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 68d9a87 2c3d9f6)
Merge branch 'master' into Mario/mute_bot_warnings
authorMario <mario.mario@y7mail.com>
Fri, 10 May 2013 04:56:09 +0000 (14:56 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 10 May 2013 04:56:09 +0000 (14:56 +1000)

Trivial merge