projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0ea50a
9d226ab
)
Merge remote-tracking branch 'origin/tizen' into new_text
54/33254/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:11:05 +0000
(10:11 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:11:40 +0000
(10:11 +0000)
Change-Id: I4cd9e02dda715ea1c7c6bcc19c54de5bd17fdb43
1
2
automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
Simple merge