Merge remote-tracking branch 'origin/tizen' into new_text 09/36309/4
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 18:08:51 +0000 (18:08 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:16:57 +0000 (19:16 +0000)
commit928136dbb9e23970f3894eabc7c8b224003b77be
tree81a0bbfb5d2d9decf2f9ea0efaba64f7c9e4e75c
parentb9766132aa8325588733797031076ea5ee825369
parentd0112823c3b9d6ff6a537df17c4ac8747a26424a
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I47246662ec5ea38428d62f11f9dd5e5bc0c50dd1
17 files changed:
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
build/tizen/configure.ac
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/dali-toolkit.h
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/radio-button-impl.h
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/text-controls/text-label.h
dali-toolkit/public-api/file.list
dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp
dali-toolkit/public-api/text/text-script.cpp
packaging/dali-toolkit.spec