]> 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: 231cfd5 8a425d3)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sat, 17 Sep 2011 14:29:00 +0000 (16:29 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 17 Sep 2011 14:29:00 +0000 (16:29 +0200)

Trivial merge