Frederik Gladhorn ca2f44680c Merge branch 'stable' into dev ... Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3		2013-01-04 11:12:05 +01:00
..
images	Doc: remove example docs that were moved to qttools	2012-12-14 11:02:47 +01:00
src	Merge branch 'stable' into dev	2013-01-04 11:12:05 +01:00
dropsite.qdoc	Add \brief to the examples.	2012-11-29 13:51:54 +01:00
mousebuttons.qdoc	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
orientation.qdoc	Add \brief to the examples.	2012-11-29 13:51:54 +01:00