projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
93ed5b7
c380151
)
Merge remote-tracking branch 'origin/tizen' into new_text
33/37533/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Mon, 30 Mar 2015 14:50:22 +0000
(15:50 +0100)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Mon, 30 Mar 2015 14:50:54 +0000
(15:50 +0100)
Change-Id: I6fab774d982acc9cc82144c82134379e573658a5
1
2
adaptors/common/adaptor-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
adaptors/common/adaptor-impl.h
patch
|
diff1
|
diff2
|
blob
|
history
packaging/dali-adaptor-mobile.spec
patch
|
diff1
|
diff2
|
blob
|
history
packaging/dali-adaptor-tv.spec
patch
|
diff1
|
diff2
|
blob
|
history
packaging/dali-adaptor-wearable.spec
patch
|
diff1
|
diff2
|
blob
|
history
packaging/dali-adaptor.spec
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
adaptors/common/adaptor-impl.cpp
Simple merge
diff --cc
adaptors/common/adaptor-impl.h
Simple merge
diff --cc
packaging/dali-adaptor-mobile.spec
Simple merge
diff --cc
packaging/dali-adaptor-tv.spec
Simple merge
diff --cc
packaging/dali-adaptor-wearable.spec
Simple merge
diff --cc
packaging/dali-adaptor.spec
Simple merge
projects / platform / core / uifw / dali-adaptor.git / commitdiff