maj
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT