]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6df22a 84dd794)
Merge remote branch 'refs/remotes/origin/mand1nga/logo-sources'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:17:48 +0000 (20:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 18:17:48 +0000 (20:17 +0200)

Trivial merge