]> 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 | combined (merge: 39e39ee 7931d63)
Merge branch 'samual/combined_updates' of http://nl.git.xonotic.org/xonotic/xonotic...
authorMario <mario.mario@y7mail.com>
Sat, 21 Dec 2013 01:04:24 +0000 (12:04 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 21 Dec 2013 01:04:24 +0000 (12:04 +1100)

Trivial merge