]> 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: 393fe35 c768e79)
Merge branches 'master' and 'master' of http://nl.git.xonotic.org/xonotic/xonotic...
authorSamual Lenks <samual@xonotic.org>
Sat, 22 Sep 2012 20:57:51 +0000 (16:57 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 22 Sep 2012 20:57:51 +0000 (16:57 -0400)

Trivial merge