]> git.xonotic.org Git - xonotic/xonotic-music.pk3dir.git/commitdiff
projects / xonotic / xonotic-music.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 053d576 e1b8323)
Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 18:49:13 +0000 (20:49 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 18:49:13 +0000 (20:49 +0200)

Trivial merge