.
.
.
Merge branch 'master' of github.com:simul/glfx

Conflicts:
	src/glfx.cpp
	src/glfx.lpp
	src/glfx.ypp
	src/glfxLALRParser.cpp
	src/glfxParser.h
	src/glfxScanner.cpp
	src/glfxScanner.h