]> git.rm.cloudns.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d1323a f1e61b0)
Merge remote branch 'refs/remotes/origin/diabolik/eX2xsources'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 17:46:11 +0000 (19:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 17:46:11 +0000 (19:46 +0200)

Trivial merge