]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a757b03 55b299e)
Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:17:12 +0000 (11:17 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:17:12 +0000 (11:17 +0200)

Trivial merge