]> 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 | compact (merge: 61b0a7b beca805)
Merge remote-tracking branch 'origin/samual/lsmaps_update'
authorSamual Lenks <samual@xonotic.org>
Sun, 25 Aug 2013 22:51:28 +0000 (18:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 25 Aug 2013 22:51:28 +0000 (18:51 -0400)

Trivial merge