]> 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: 71954bb a571fcb)
Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 18:47:17 +0000 (20:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 18:47:17 +0000 (20:47 +0200)

Trivial merge