commit
Meta data
Windows goes again
Merge branch 'master' of https://github.com/nieknooijens/SM42GLES

Conflicts:
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.cdt.core/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/GLES_test/.indexes/e4/83/da/66/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/GLES_test/.indexes/e4/83/da/fe/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	workspace/GLES_test/bin/GLES_test.apk
	workspace/GLES_test/bin/classes.dex
	workspace/GLES_test/bin/resources.ap_