Samuel Rødal 42f2da5e6b Merge remote branch 'gerrit/master' into refactor ... Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf		2011-08-30 11:51:20 +02:00
..
mac	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qpa	Move XCB event reading to a separate thread.	2011-08-26 09:19:01 +02:00
qws	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unix	Merge remote branch 'gerrit/master' into refactor	2011-07-06 14:08:02 +02:00
x11	Fix fontconfig configure test	2011-08-29 16:28:17 +02:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00