Frederik Gladhorn c8ca300e49 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a		2013-08-21 11:03:18 +02:00
..
doc_src_qmake-manual.cpp	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
doc_src_qmake-manual.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02:00