Jørgen Lind 18a3f6169b Merge remote-tracking branch 'base/master' into refactor ... Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745		2011-06-27 12:27:54 +02:00
..
flickable.cpp	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
flickable.h	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
flickable.pro	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
main.cpp	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00