]> 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: eba2a13 8d640f8)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 10 Apr 2011 15:57:56 +0000 (17:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 10 Apr 2011 15:57:56 +0000 (17:57 +0200)

Trivial merge