]> 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: 898360d 970e6c1)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:02:46 +0000 (20:02 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 19:02:46 +0000 (20:02 +0100)

Trivial merge