[Development] Preparing to release repackaged version of Qt 4.8.3 with Digia copyrights

[Thiago Macieira]

On quinta-feira, 4 de outubro de 2012 13.38.46, Stephen Kelly wrote:
> git merge v4.8.4

Better yet:
git merge -s ours v4.8.4

No conflicts.
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- 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/20121004/4f7f3fbd/attachment.sig>