]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4afd4a3 44c6431)
Merge branch 'master' into divVerent/workarea divVerent/workarea
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 21 Mar 2015 22:14:20 +0000 (23:14 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 21 Mar 2015 22:14:20 +0000 (23:14 +0100)

Trivial merge