]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34596f8 b0303d8)
Merge branch 'samual/combined_updates' of http://nl.git.xonotic.org/xonotic/xonotic...
authorSamual Lenks <samual@xonotic.org>
Sat, 21 Dec 2013 01:09:06 +0000 (20:09 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 21 Dec 2013 01:09:06 +0000 (20:09 -0500)

Trivial merge