]> 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: 9531e6a 7e9d440)
Merge branch 'master' into Mario/nade_drop
authorMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)

Trivial merge