]> 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: bd7454d 90f566a)
Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorSamual Lenks <samual@xonotic.org>
Mon, 24 Sep 2012 18:58:23 +0000 (14:58 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 24 Sep 2012 18:58:23 +0000 (14:58 -0400)

Trivial merge