]> 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: caba0b3 7bdde1b)
oilrig.map
authorDebugger <pyngot@hotmail.com>
Sun, 21 Apr 2013 14:19:47 +0000 (16:19 +0200)
committerDebugger <pyngot@hotmail.com>
Sun, 21 Apr 2013 14:19:47 +0000 (16:19 +0200)

Trivial merge