Fixed duplicate enum definition compile errors
Merge branch 'master' of github.com:bitshifter/glfw-rs

Conflicts:
	src/lib.rs