Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62		2013-05-23 21:27:07 +02:00
..
qatomicint	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qatomicpointer	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfuture	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qfuturesynchronizer	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfuturewatcher	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
qmutex	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmutexlocker	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qreadlocker	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qreadwritelock	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qresultstore	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsemaphore	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qthread	tst_qthread: fix race on "bool visited"	2013-03-29 15:16:47 +01:00
qthreadonce	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qthreadpool	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
qthreadstorage	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
qwaitcondition	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwritelocker	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread.pro	Move QFutureSynchronizer back to QtCore	2012-09-28 23:50:10 +02:00