Merge remote-tracking branch 'origin/tizen' into new_text 87/35887/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 25 Feb 2015 13:09:19 +0000 (13:09 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 25 Feb 2015 13:09:19 +0000 (13:09 +0000)
commit7f1ec8d94a8737c17a1c428b188654291a01c630
tree732209ea2e56f93734ecbe62ce81d7101970bbb1
parent8b189bab73db96b219fae96b633901cc5d948d09
parentcf96778a44b5887263bd6ab609893a4b0ec2b7ef
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/configure.ac
packaging/dali-adaptor-mobile.spec
packaging/dali-adaptor-tv.spec
packaging/dali-adaptor-wearable.spec
platform-abstractions/slp/font-platform/font-controller-impl.cpp
platform-abstractions/slp/font-platform/font-controller-impl.h

Change-Id: I03f316eeadbe029c5872ee59042c4466b88430d7
adaptors/common/object-profiler.cpp
adaptors/common/style-monitor-impl.cpp
adaptors/public-api/file.list
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/file.list