projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
93fb6a1
7f35cb5
)
Merge remote-tracking branch 'origin/tizen' into new_text
57/33257/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:12:50 +0000
(10:12 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:12:50 +0000
(10:12 +0000)
Conflicts:
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Relayout-Utilities.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp
Change-Id: I03204cfe486d6b861d970676b9db41749c6236eb
1
2
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
patch
|
diff1
|
diff2
|
blob
|
history
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
patch
|
diff1
|
diff2
|
blob
|
history
packaging/dali-toolkit.spec
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
Simple merge
diff --cc
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
Simple merge
diff --cc
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
Simple merge
diff --cc
packaging/dali-toolkit.spec
Simple merge
projects / platform / core / uifw / dali-toolkit.git / commitdiff