]> 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: 770fcdb e07aef7)
Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay
authorRudolf Polzer <divverent@xonotic.org>
Wed, 25 Jul 2012 07:51:04 +0000 (09:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 25 Jul 2012 07:51:04 +0000 (09:51 +0200)

Trivial merge