Liang Qi e918605f42 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/json/qjsonparser.cpp src/gui/opengl/qopengl.cpp Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b		2016-11-04 11:39:15 +01:00
..
doc	Unify license header usage.	2016-03-29 10:20:03 +00:00
dombookmarks.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
jennifer.xbel	Update bookmarks in the XML bookmarks examples	2016-11-01 08:37:50 +00:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.h	Unify license header usage.	2016-03-29 10:20:03 +00:00
xbeltree.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
xbeltree.h	Unify license header usage.	2016-03-29 10:20:03 +00:00