]> 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 | combined (merge: c0f73a9 fa7ed47)
Merge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:28:50 +0000 (10:28 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 2 Jul 2010 08:28:50 +0000 (10:28 +0200)

Trivial merge