Merge remote-tracking branch 'origin/tizen' into new_text 47/37847/1
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:23:52 +0000 (11:23 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:23:52 +0000 (11:23 +0100)
commitecca9a6b2bab7cdeac8763d2f6be63e1b371d768
tree0fcbe551b7139dba004fe51031cff5b98cb6bff2
parent0c29a5f0da6f783eb98561172bc8179395e8d24e
parent391659a08e30ce6430ecc569f99cc2556990d700
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
adaptors/common/adaptor-impl.cpp
build/tizen/adaptor/Makefile.am

Change-Id: I35f6abe9eeebb9f3f73f4f75c32c3bcd07682cf3
adaptors/common/adaptor-impl.cpp
adaptors/common/adaptor-impl.h
adaptors/common/application-impl.cpp
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