[Development] Bad merge resolution in qtbase's second commit

[Thiago Macieira]

On terça-feira, 18 de setembro de 2012 12.06.56, liang.qi at nokia.com wrote:
> 9f9f3314144b54121a29c37270c73075bae2e129 is the issue commit.

Thanks Liang

That commit's message has nothing to do with half of the changes being 
committed, so my guess is that it is *also* a bad merge / rebase conflict 
resolution, just not where I had expected it to be.

But that means there's a lower chance that regressions were introduced by the 
qtquick2 merge.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
     Intel Sweden AB - Registration Number: 556189-6027
     Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20120918/ffa15146/attachment.sig>