]> 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: 68922df 05424c6)
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Sat, 14 Jan 2012 20:43:11 +0000 (15:43 -0500)
committerSamual <samual@xonotic.org>
Sat, 14 Jan 2012 20:43:11 +0000 (15:43 -0500)

Trivial merge