projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
058d41e
2cc3286
)
Merge branch devel/master (1.0.49) into tizen
74/46374/1
tizen_3.0.m1_mobile
tizen_3.0.m1_tv
tizen_temp
accepted/tizen/mobile/20150820.115818
accepted/tizen/mobile/20150820.115841
accepted/tizen/tv/20150820.115913
accepted/tizen/wearable/20150820.120020
submit/tizen/20150820.112512
submit/tizen_common/20151023.083358
submit/tizen_common/20151026.085049
submit/tizen_mobile/20150820.095541
tizen_3.0.m1_mobile_release
tizen_3.0.m1_tv_release
tizen_3.0.m2.a1_mobile_release
tizen_3.0.m2.a1_tv_release
author
taeyoon
<taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 08:43:41 +0000
(17:43 +0900)
committer
taeyoon
<taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 13:30:01 +0000
(22:30 +0900)
Conflicts:
packaging/com.samsung.dali-demo.spec
Change-Id: I84020ab46ab80fa2b5439c180b295a2a068d1e10
Trivial merge