projects
/
platform
/
core
/
appfw
/
data-provider-master.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2add6d3
6255b2b
)
Merge branch 'devel/home/master'
author
Sung-jae Park
<nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:16:44 +0000
(17:16 +0900)
committer
Sung-jae Park
<nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:16:44 +0000
(17:16 +0900)
Conflicts:
data/x11.mobile.480x800.conf.ini
src/event.c
Change-Id: I1c0e9947c7aa5b0df3456ffc0a2ff36d49565c90
Trivial merge