From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 29 Nov 2013 15:03:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Tag: upstream/5.2.95+rc1~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5706f05a8315c10398a53ba3b269a2b22d01a7d;p=platform%2Fupstream%2Fqtmultimedia.git

Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9
---

c5706f05a8315c10398a53ba3b269a2b22d01a7d