Merge remote branch 'origin/4.7' into HEAD
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 1 Apr 2010 21:07:37 +0000 (23:07 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 1 Apr 2010 21:07:37 +0000 (23:07 +0200)
commit23eb677daea8e084fcaa1256f1a9433e324b1474
treea21225293db6881174814290ad7298120c4a078b
parent1f327a1de8db245d0b28e7dfdc5bca1af0b56782
parent37e8fd4e09c1221efde3e67e6acd5cfbb35686fd
Merge remote branch 'origin/4.7' into HEAD

Conflicts:
examples/declarative/proxywidgets/proxywidgets.pro
examples/declarative/widgets/mywidgets.pro
examples/declarative/widgets/widgets.pro