]> 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: c46f5e0 6a6ce13)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 27 Jan 2012 11:33:29 +0000 (12:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 27 Jan 2012 11:33:29 +0000 (12:33 +0100)

Trivial merge