2D rajzolas
merge
Merge branch 'master' of https://github.com/ppolcz/QtOpenGL

Conflicts:
	nbproject/configurations.xml
	nbproject/private/private.xml
	nbproject/qt-Debug.pro
	nbproject/qt-Release.pro