Merge remote-tracking branch 'origin/master' into divVerent/courtfun2
authorRudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)
commitabaf76aed876b9317a05eba71c38255f8ea8921e
tree88ba1e57b42c65bb72cdbaa6e418e24e55fd521e
parentd6acc63fbe0254244735a561a4ec93990b2e5718
parent877b8212505540880ce7204e1a369f35be028bab
Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

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