Sergio Ahumada f7837e28b5 Merge branch 'stable' into dev ... Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a		2013-09-13 18:04:17 +02:00
..
configure	Merge branch 'stable' into dev	2013-09-13 18:04:17 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00