Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 21:28:55 +0000 (22:28 +0100)
committerMirio <opivy@hotmail.de>
Mon, 6 Mar 2017 21:28:55 +0000 (22:28 +0100)
1  2 
scripts/shaderlist.txt

Simple merge