Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:38:25 +0000 (10:38 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:38:25 +0000 (10:38 +0200)
Conflicts:
.qmake.conf

Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54

1  2 
qtmultimedia.pro

Simple merge