]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaf7f7e aa4045c)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir xonotic-v0.1.0preview
authorRudolf Polzer <divverent@alientrap.org>
Wed, 22 Dec 2010 19:48:13 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 22 Dec 2010 19:48:13 +0000 (20:48 +0100)

Trivial merge