]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/augenkrebs
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Mar 2012 18:35:54 +0000 (19:35 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Mar 2012 18:35:54 +0000 (19:35 +0100)
commita18db09e0576ee7278c13601629422a63ca7459e
treedf0fbadfeb8bf8bb96448733678a8d1cd516505a
parent8e040a2f917efc6a5d64b09540d5a592cdbfb221
parent44e2ba610d62bdff1b3a6a0d7b891429c955d4ad
Merge branch 'master' into divVerent/augenkrebs

Conflicts:
scripts/shaderlist.txt
scripts/shaderlist.txt