Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:51:20 +0000 (10:51 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:51:20 +0000 (10:51 +0200)
commitef3ba733ffd9df90af311574502b9a7d1400e3e2
tree4817f3461025bf191e4cc0e6817987648fd2d954
parent12dd11480124929e4d0433e17fb6f12f320335a3
parent16d5447febe09fcb44be6cdb77e03ffb80238bd9
Merge branch 'stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I7186fb9caa9f5a6040f31ab18d04a133cff5f198