]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commit92c50bd4e5cbf83970f9e73912cb15df8ad5e339
tree66a81336adba61d63fbfa97692f1073df670123f
parent2dd04cd717af16e9325288dfa18c5d6c389d3b7c
parentfb4b0e3abb8191950b0d64a00e91a7cc0d8ce7fd
Merge branch 'master' into divVerent/augenkrebs

Conflicts:
scripts/shaderlist.txt