Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
bearer	Doc: Fix miscellaneous typos	2013-10-30 00:34:34 +01:00
doc	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
socket	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
ssl	Fix the QSslSocket::setCiphers(const QString &) overload.	2014-02-02 12:18:23 +01:00
network.pro	Enable bundling Qt in Android package in build system	2013-05-01 11:24:15 +02:00