Merge branch 'dev' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 19 Mar 2013 08:20:55 +0000 (09:20 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Tue, 19 Mar 2013 08:21:43 +0000 (09:21 +0100)
commit1b8090c238b44d1811b9716e1c9c348f05371e16
tree55f4cc8f689a2e2708a062e877681bbbd3014510
parent3e7042fb70597150a137e2e449b67e759d45c3fe
parent313d60c107d9659efd5e93ba5a036054f6b1ebba
Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I2fc10bd848450dd3102e8525ba226ce3aa027cdd
src/plugins/imageformats/mng/qmnghandler.cpp