]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a677908 4a57d2c)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Apr 2012 09:34:54 +0000 (11:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Apr 2012 09:34:54 +0000 (11:34 +0200)

Trivial merge