projects
/
platform
/
adaptation
/
intel_mfld
/
mmfw-sysconf-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a34a0d4
f4dc5dd
)
Merge branch 'master' into tizen_2.1
author
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Thu, 21 Mar 2013 12:50:36 +0000
(14:50 +0200)
committer
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Thu, 21 Mar 2013 13:04:40 +0000
(15:04 +0200)
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
Trivial merge