From: Telle-Tiia Pitkänen Date: Thu, 21 Mar 2013 12:50:36 +0000 (+0200) Subject: Merge branch 'master' into tizen_2.1 X-Git-Tag: 2.1b_release~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83a53cdd52ca0cacb47d9ea17bb739c34718f5f5;p=platform%2Fadaptation%2Fintel_mfld%2Fmmfw-sysconf-mfld-blackbay.git Merge branch 'master' into tizen_2.1 Conflicts: mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder.ini mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_pri.ini mmfw-sysconf-mfld-blackbay/usr/etc/mmfw_camcorder_dev_video_sec.ini packaging/mmfw-sysconf-mfld-blackbay.changes packaging/mmfw-sysconf-mfld-blackbay.spec Change-Id: I32ddf74f4fc4f50ae3126dd3b22a662b9cbc3f62 --- 83a53cdd52ca0cacb47d9ea17bb739c34718f5f5