Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:25:17 +0000 (10:25 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:25:57 +0000 (10:25 +0200)
commit6d3df9df2930a15877d81abec9ac10052968d9c4
tree31a05f11c2064436a681e0d5813d311f9082b00c
parent85c2acf0bc83509cc56464630caf27baf96282ca
parentd6b4d9ad75b06b16d7555ebeace6f06010379cf5
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: I8472ccedaa829436aebf4424b64a3b7dd0adc173