Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 09:00:38 +0000 (10:00 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 09:00:38 +0000 (10:00 +0100)
1  2 
scripts/shaderlist.txt

Simple merge