projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e424c13
6edc587
)
Merge remote-tracking branch 'origin/tizen' into new_text
28/35428/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Fri, 13 Feb 2015 14:44:44 +0000
(14:44 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Fri, 13 Feb 2015 16:04:23 +0000
(16:04 +0000)
Change-Id: I488923c30b5009a58c02bc99e241bb1a8ad942d4
1
2
automated-tests/src/dali/utc-Dali-Scripting.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/update/manager/update-algorithms.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali/utc-Dali-Scripting.cpp
Simple merge
diff --cc
dali/internal/update/manager/update-algorithms.cpp
Simple merge
projects / platform / core / uifw / dali-core.git / commitdiff