review.tizen.org Git - platform/core/uifw/dali-toolkit.git/commit

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/buttons/radio-button-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-handles-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/internal/controls/text-input/text-input-popup-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
dali-toolkit/public-api/controls/text-input/text-input.cpp
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.cpp
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: Icce105492c4770040956a99aa871bbda03f0da4c

author	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 25 Feb 2015 13:33:11 +0000 (13:33 +0000)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 25 Feb 2015 14:21:46 +0000 (14:21 +0000)
commit	1db0a8becea3dbdebaa942d934d91824a92434e7
tree	ce40f1b42efc5056833b36cd5492fef281d548b3	tree \| snapshot
parent	8363c13a95006c0cbfe3074e9b601bdaef9537f5	commit \| diff
parent	e217915091790637a8b4ea7e34480e852d242efd	commit \| diff

automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/dali-toolkit.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/buttons/button-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/buttons/push-button-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/buttons/radio-button-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/popup/popup-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/relayout-controller-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/relayout-controller.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/slider/slider-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp	diff1 \|	\|	blob \| history
dali-toolkit/public-api/controls/popup/popup.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/popup/popup.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/file.list	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/text/decorator/text-decorator.cpp	diff1 \|	\|	blob \| history
dali-toolkit/public-api/text/decorator/text-decorator.h	diff1 \|	\|	blob \| history
dali-toolkit/public-api/text/shaper.cpp	diff1 \|	\|	blob \| history
packaging/dali-toolkit.spec	diff1 \|	diff2 \|	blob \| history