Merge remote-tracking branch 'origin/tizen' into new_text 63/36463/3
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 6 Mar 2015 15:40:09 +0000 (15:40 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 6 Mar 2015 16:07:49 +0000 (16:07 +0000)
commit231230a5c0cc330ae69bde037ef3a471f99f45f5
tree4736eb4cc2f7bc61fd881bc388057efc4c85ed26
parentfed935bc080ff6df211def1087ab688408113edb
parented8569eeccfaf1431d190aa3ecc55c56ae352b91
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/adaptor/Makefile.am
platform-abstractions/slp/slp-platform-abstraction.cpp
platform-abstractions/slp/slp-platform-abstraction.h

Change-Id: Ie98f87b62386114568d85bd23d87c909e18fe6b5
13 files changed:
adaptors/common/adaptor-impl.cpp
adaptors/common/adaptor-impl.h
adaptors/common/application-impl.cpp
automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp
automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
build/tizen/adaptor/Makefile.am
build/tizen/configure.ac
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
packaging/dali-adaptor.spec
platform-abstractions/slp/slp-platform-abstraction.cpp
platform-abstractions/slp/slp-platform-abstraction.h