]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfb9640 cc9dee3)
Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:48:20 +0000 (23:48 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 03:48:20 +0000 (23:48 -0400)

Trivial merge