]> 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 | compact (merge: 42dc8ef 10a36a8)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...
authorMaik Merten <maikmerten@googlemail>
Sun, 7 Nov 2010 15:30:02 +0000 (16:30 +0100)
committerMaik Merten <maikmerten@googlemail>
Sun, 7 Nov 2010 15:30:02 +0000 (16:30 +0100)

Trivial merge