]> 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: 7d2d2d5 b739797)
Merge branch 'master' into plasmasheep/lsp
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:54:02 +0000 (20:54 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 18:54:02 +0000 (20:54 +0200)

Trivial merge