]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc7da23 0de5174)
Merge branch 'mediasource/m0rfar/SkySources' of git://git.xonotic.org/xonotic/oldstuff
authorRudolf Polzer <divverent@xonotic.org>
Sun, 19 Feb 2012 15:31:25 +0000 (16:31 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 19 Feb 2012 15:31:25 +0000 (16:31 +0100)

Trivial merge