Merge remote-tracking branch 'origin/tizen' into new_text 49/37849/2
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:34:34 +0000 (11:34 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:53:37 +0000 (11:53 +0100)
commit56d412791a44c2a79135d2293c13fddb135c9d54
tree3028c599e4e4c576fd4ff317b92f9ce677fd7df7
parent2ea37149ec3b54f9f2255cca9eca5429907b5601
parent125df617516edc317ab800bdf897e6d076d7b324
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Icb029929ab92e9d4c606f47c50d8d213759f09c5
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
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/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/public-api/controls/control-impl.cpp
packaging/dali-toolkit.spec