]> 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: 7081c0a ecde008)
Merge branch 'master' into debugger/go
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 22:40:55 +0000 (23:40 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 22:40:55 +0000 (23:40 +0100)

Trivial merge