Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:51:54 +0000 (19:51 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:51:54 +0000 (19:51 +0200)
commita5ca4a64ac54a2bc67421a74d2caf5f085d26861
tree54b867facb4601a5597336f08f1c999c02087e9d
parent5795eaf936ca43306c3bcaf53cf943de01fa796f
parented11da0e216c84c4950f57cf9d9d262221050d4f
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I6036f0aa9166f6e7f57192ae92fb2c1322df3845