]> 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: 2b39ce5 3185672)
Merge remote-tracking branch 'origin/divVerent/csad'
authorSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:45:24 +0000 (19:45 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 00:45:24 +0000 (19:45 -0500)

Trivial merge