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/utc-Dali-TextView.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/relayout-controller-impl.cpp
dali-toolkit/internal/controls/relayout-controller.cpp
dali-toolkit/internal/controls/relayout-helper.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.h
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control.h
docs/content/main-page.h
plugins/dali-script-v8/src/actors/actor-wrapper.h

Change-Id: Ia0aff01756e6d803616d9c4eae82f405c6cb2c0f

author	Paul Wisbey <p.wisbey@samsung.com>
	Mon, 30 Mar 2015 15:03:35 +0000 (16:03 +0100)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 31 Mar 2015 13:27:01 +0000 (14:27 +0100)
commit	cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd
tree	a29a7c006f019485b1b80782cf1a2a4b74228ce2	tree \| snapshot
parent	77af5d8a3230bf16729573df1866be763938ca40	commit \| diff
parent	834ddf7832598a57fc18c282371554a1ed8f0a78	commit \| diff

automated-tests/src/dali-toolkit/utc-Dali-Popup.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/popup/popup-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/popup/popup-impl.h	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/internal/controls/text-controls/text-field-impl.h	diff1 \|	\|	blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp	diff1 \|	\|	blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.h	diff1 \|	\|	blob \| history
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp	diff1 \|	\|	blob \| history
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h	diff1 \|	\|	blob \| history
dali-toolkit/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/decorator/text-decorator.cpp	diff1 \|	\|	blob \| history
dali-toolkit/public-api/controls/control-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control.h	diff1 \|	diff2 \|	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/controls/text-controls/text-label.cpp	diff1 \|	\|	blob \| history
dali-toolkit/public-api/controls/text-controls/text-label.h	diff1 \|	\|	blob \| history
docs/content/main-page.h	diff1 \|	diff2 \|	blob \| history
packaging/dali-toolkit.spec	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/file.list	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/actors/actor-api.cpp	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/actors/actor-api.h	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/actors/actor-wrapper.cpp	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/actors/actor-wrapper.h	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/dali-wrapper.cpp	diff1 \|	diff2 \|	blob \| history
plugins/dali-script-v8/src/shader-effects/shader-effect-api.cpp	diff1 \|	diff2 \|	blob \| history