projects
/
platform
/
core
/
multimedia
/
mmfw-sysconf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b35f0da
ce1a232
)
Merge branch 'tizen' into tizen_3.0
76/102076/1
author
SeokHoon Lee
<andy.shlee@samsung.com>
Mon, 5 Dec 2016 02:01:37 +0000
(11:01 +0900)
committer
SeokHoon Lee
<andy.shlee@samsung.com>
Mon, 5 Dec 2016 02:02:03 +0000
(11:02 +0900)
Conflicts:
packaging/mmfw-sysconf.spec
Change-Id: I33fb03c599912f9dd962d6e8c1a6f35e63679401
Trivial merge