]> git.rm.cloudns.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d9d763 b5272cb)
Merge remote branch 'refs/remotes/origin/divVerent/rising-of-the-phoenix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 19:06:58 +0000 (21:06 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Aug 2010 19:06:58 +0000 (21:06 +0200)

Trivial merge