]> 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: 0fac2f9 2f81d46)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 26 Jul 2011 12:17:07 +0000 (14:17 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 26 Jul 2011 12:17:07 +0000 (14:17 +0200)

Trivial merge