。。。
Merge branch 'master' of https://github.com/nervecell/GL3D

Conflicts:
	GL3D.pro.user