]> 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: 2dd04cd fb4b0e3)
Merge branch 'master' into divVerent/augenkrebs
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:33:51 +0000 (20:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:33:51 +0000 (20:33 +0200)
Conflicts:
scripts/shaderlist.txt


Trivial merge