Files
qt5/.gitmodules
Oswald Buddenhagen 2068af50ca Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.gitmodules
	qtquickcontrols2
	qtwebview

Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
2015-09-18 12:00:07 +02:00

3.8 KiB