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
..
external-resources.qdoc	Update Urls to CMake docs.	2013-05-20 12:06:48 +02:00
qch-urls.qdoc	Doc: Copying changes to external pages from qtdoc	2013-05-07 14:28:43 +02:00
qt-webpages.qdoc	Doc: Adding link to Qt for BlackBerry wiki as external page	2013-08-14 11:48:36 +02:00
qtcreator.qdoc	Doc: Adding Qt Creator Manual as \externalpage	2013-04-30 12:45:30 +02:00
rfc.qdoc	Add the RFC2822Date format	2013-07-24 15:02:35 +02:00