Samuel Rødal 2371147354 Merge remote branch 'gerrit/master' into refactor ... Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4		2011-07-12 12:52:22 +02:00
..
customproxy.cpp	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
customproxy.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
embeddeddialog.cpp	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
embeddeddialog.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
embeddeddialog.ui	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
embeddeddialogs.pro	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
embeddeddialogs.qrc	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
main.cpp	Merge remote branch 'gerrit/master' into refactor	2011-07-12 12:52:22 +02:00
No-Ones-Laughing-3.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00