]> 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: d28bb71 f12a9db)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMaidenBeast <fel.sallustio@gmail.com>
Fri, 22 Jul 2011 07:39:53 +0000 (09:39 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Fri, 22 Jul 2011 07:39:53 +0000 (09:39 +0200)

Trivial merge