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

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

Conflicts:
automated-tests/src/dali-toolkit-unmanaged/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextInput.cpp
base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp
base/dali-toolkit/internal/controls/text-view/text-view-impl.h
base/dali-toolkit/public-api/controls/text-input/text-input.cpp
base/dali-toolkit/public-api/controls/text-input/text-input.h
base/dali-toolkit/public-api/controls/text-view/text-view.cpp
base/dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I98c12cbab5fe05cdcc60b42c4eeeb34ffc9ac7cc

author	Paul Wisbey <p.wisbey@samsung.com>
	Mon, 9 Feb 2015 18:27:18 +0000 (18:27 +0000)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Mon, 9 Feb 2015 18:27:18 +0000 (18:27 +0000)
commit	c803046c24398c2037a83d105a932976dede943f
tree	8c023edb77e267753a75f8452c145b36edbdbb24	tree \| snapshot
parent	c53a59521473d7362235aebf58c99b85734b83e6	commit \| diff
parent	c95e793de54b10be70c3b6a68ec8952e430809c1	commit \| diff

automated-tests/src/dali-toolkit/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-NavigationControl.cpp	diff1 \|	diff2 \|	blob \| history
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
base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/controls/buttons/radio-button-impl.h	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/controls/popup/popup-impl.cpp	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/controls/popup/popup-impl.h	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/internal/file.list	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/public-api/controls/popup/popup.cpp	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/public-api/controls/popup/popup.h	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/public-api/file.list	diff1 \|	diff2 \|	blob \| history
optional/dali-toolkit/dali-toolkit.h	diff1 \|	diff2 \|	blob \| history
packaging/dali-toolkit.spec	diff1 \|	diff2 \|	blob \| history