]> 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: a235728 c9a4e7c)
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data...
authorSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:17:40 +0000 (18:17 -0400)
committerSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:17:40 +0000 (18:17 -0400)

Trivial merge