]> 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: 227419b 53ec6ce)
Merge remote branch 'origin/master' into fruitiex/runningmanctf
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:16:04 +0000 (12:16 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:16:04 +0000 (12:16 +0200)

Trivial merge