Merge remote branch 'gerrit/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Tue, 30 Aug 2011 09:51:17 +0000 (11:51 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Tue, 30 Aug 2011 09:51:20 +0000 (11:51 +0200)
commit42f2da5e6b543e698fc4f036c45ebb15078409c8
tree2d688b1a812d8410d4ae85283d5e413957000e11
parente9962cc300a805ce09a02ce0c9ae23ceaf8073bb
parent009f3d14045e2e2a6eff8c87a8da9eaa621c5249
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/src.pro

Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
configure
src/corelib/kernel/qobject.cpp
src/src.pro
sync.profile
tools/configure/configureapp.cpp