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

author Paul Wisbey <p.wisbey@samsung.com>

Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)

committer Paul Wisbey <p.wisbey@samsung.com>

Tue, 7 Apr 2015 10:02:40 +0000 (11:02 +0100)
author Paul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)
committer Paul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:02:40 +0000 (11:02 +0100)
diff --cc automated-tests/src/dali/utc-Dali-Scripting.cpp
Simple merge
diff --cc dali/internal/update/manager/update-algorithms.cpp
Simple merge
author	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Tue, 7 Apr 2015 10:02:40 +0000 (11:02 +0100)
		1	2
automated-tests/src/dali/utc-Dali-Scripting.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-algorithms.cpp	patch \|	diff1 \|	diff2 \|	blob \| history