maj
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
Disable checkbox lissage/aliasing
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
Merge branch 'master' of github.com:SoyouzTeam/OpenGL_QT
conflit