projects
/
apps
/
livebox
/
livebox-edje.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3019a34
160817b
)
Merge branch 'master' into tizen_2.1
author
Sung-jae Park
<nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:00:10 +0000
(13:00 +0000)
committer
Sung-jae Park
<nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:00:10 +0000
(13:00 +0000)
Conflicts:
packaging/liblivebox-edje.spec
src/script_port.c
Change-Id: I39e25cac21bfb97a362226925df8eb41d1322c1e
Trivial merge
projects / apps / livebox / livebox-edje.git / commitdiff