]> 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: ded2656 9743854)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 11 Feb 2012 13:55:35 +0000 (14:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 11 Feb 2012 13:55:35 +0000 (14:55 +0100)

Trivial merge