Merge "Revert "[3.0] Make only dali-toolkit.spec file be used because of gbs build...
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / bubble-effect / bubble-emitter.cpp
2016-02-26 dongsug.songMerge branch 'devel/master' into tizen 39/60139/2 accepted/tizen/common/20160302.194024 accepted/tizen/ivi/20160302.073519 accepted/tizen/mobile/20160302.073314 accepted/tizen/tv/20160302.073350 accepted/tizen/wearable/20160302.073454 submit/tizen/20160226.050754 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
2016-02-08 Xiangyin MaUpdate following the changes of blending&culling options 24/58524/5
2015-08-19 taeyoonMerge branch devel/master(1.0.49) into tizen 65/46365/1 tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_temp accepted/tizen/mobile/20150820.115740 accepted/tizen/mobile/20150820.115828 accepted/tizen/tv/20150820.115858 accepted/tizen/wearable/20150820.120006 submit/tizen/20150820.112512 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_mobile/20150820.095541 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
2015-06-26 Francisco SantosMerge branch 'devel/new_mesh' into devel/master 86/42386/2
2015-06-26 Francisco SantosMerge branch 'devel/master' into devel/new_mesh 81/42381/1 devel/new_mesh
2015-06-26 Francisco SantosMerge branch 'devel/master' into devel/new_mesh 13/42313/3
2015-06-09 Adeel KazmiMerge "Merge branch 'tizen' into devel/new_mesh" into...
2015-06-08 Francisco SantosMerge branch 'tizen' into devel/new_mesh 34/40734/2
2015-05-19 Nick HollandMove more public-api headers to devel-api. PART 3 55/39555/2