]> 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: 09c1b18 ad8f3ce)
Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Thu, 5 Dec 2013 23:07:31 +0000 (18:07 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 5 Dec 2013 23:07:31 +0000 (18:07 -0500)

Trivial merge