Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:52 +0000 (16:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:52 +0000 (16:03 +0100)
commitc5706f05a8315c10398a53ba3b269a2b22d01a7d
tree54f83c3f0bd4ce7325adbd767a46bb146f1fdab6
parent0c8be637087a3c7aa038cf72f3a3ed6f7aca0510
parent9b7fd8c7691981bb1d89704f595ebf50daf8876e
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9