projects / platform / adaptation / intel_mfld / mmfw-sysconf-mfld-blackbay.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a34a0d4 f4dc5dd)
Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 21 Mar 2013 12:50:36 +0000 (14:50 +0200)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 21 Mar 2013 13:04:40 +0000 (15:04 +0200)
commit83a53cdd52ca0cacb47d9ea17bb739c34718f5f5
treed5576de844fb2fd773f2284159b01bbf544e5322tree | snapshot
parenta34a0d458c9e594302dc57eb5489a14249625ef3commit | diff
parentf4dc5dd66c5a2648784f15acdd42a9d83f2ff2eccommit | diff
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
Domain: System / Uncategorized;