]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49d7a5d c1b31af)
Merge remote-tracking branch 'origin/Mirio/techassault'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:27:05 +0000 (23:27 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:27:05 +0000 (23:27 -0400)

Trivial merge