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
..
configure	Merge remote branch 'gerrit/master' into refactor	2011-08-30 11:51:20 +02:00
shared	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
uilib	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00