]> 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: 1f5b536 5a435db)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Tue, 1 Nov 2011 08:26:46 +0000 (09:26 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 1 Nov 2011 08:26:46 +0000 (09:26 +0100)

Trivial merge