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)
commit1185ba65a765f18bfabc9b88fc216fd16b843c61
tree607d930c1dc7fa77f575a5ac8c525cc9126722ac
parenta757b03bd1c6575c147dfe6f7a1a01a3557355cd
parent55b299e829c5f43b6517577f8936c371a8ffc107
Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'