]> 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: c657ec7 50c05a6)
Merge branch 'master' into divVerent/shalom8 divVerent/shalom8
authorRudolf Polzer <divverent@xonotic.org>
Sat, 18 Jan 2014 14:35:28 +0000 (15:35 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 18 Jan 2014 14:35:28 +0000 (15:35 +0100)

Trivial merge