]> 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: 2988181 bd4eebf)
Merge branch 'master' into kuniuthefrogg/xoylent_ctf
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 17 Sep 2013 22:21:37 +0000 (00:21 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 17 Sep 2013 22:21:37 +0000 (00:21 +0200)

Trivial merge