Information for GLSL-master-3.5-998

Version
3.5-998
Branch
GLSL-master
Date
10 years, 1 month ago
Windows x64 Windows x86 Mac OS X
Commit
382be2aabdf0635c67f9ec945283f77f8ed9b0c9
Change author
degasus
Change description 
Merge branch 'master' into GLSL-master

Conflicts:
	.gitignore