Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:13:43 +0000 (11:13 +0100)
committerMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:13:43 +0000 (11:13 +0100)
1  2 
scripts/shaderlist.txt

Simple merge