]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8bd0e70 1c94bdb)
Merge remote-tracking branch 'origin/Mirio/silentsiege'
authorMario <zacjardine@y7mail.com>
Wed, 21 Jan 2015 16:04:24 +0000 (03:04 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 21 Jan 2015 16:04:24 +0000 (03:04 +1100)

Trivial merge