Merge "Revert "[3.0] Make only dali-toolkit.spec file be used because of gbs build...
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / bubble-effect / bubble-actor.cpp
2016-05-04 dongsug.songMerge branch 'devel/master' into tizen 85/68385/1 accepted/tizen/common/20160509.135143 accepted/tizen/ivi/20160510.002628 accepted/tizen/mobile/20160510.002532 accepted/tizen/tv/20160510.002557 accepted/tizen/wearable/20160510.002501 submit/tizen/20160509.092357
2016-04-18 Adeel KazmiMerge "Remove sys-string and use dali-toolkit po files...
2016-04-18 Ferran SoleRendering API clean-up 49/64949/10
2016-01-15 taeyoonMerge branch 'devel/master( 1.1.16 )' into tizen 77/57077/1 accepted/tizen/mobile/20160122.080625 accepted/tizen/tv/20160122.082337 accepted/tizen/wearable/20160122.082359 submit/tizen_common/20160122.071605 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
2015-11-11 Adeel KazmiMerge "Fix overshoot issue - not to make an overshoot...
2015-11-11 Kimmo HoikkaMerge "Fix various Klocwork errors" into devel/master
2015-11-11 Adeel KazmiFix various Klocwork errors 35/51635/2
2015-10-28 taeyoonMerge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen 39/50139/3 accepted/tizen/mobile/20151102.112611 accepted/tizen/tv/20151102.112656 accepted/tizen/wearable/20151102.112721 submit/tizen/20151102.084015
2015-08-28 Adeel KazmiMerge "Fix prevent issues" into devel/master
2015-08-28 Adeel KazmiMerge "Fix VD prevent issues" into devel/master
2015-08-28 Heeyong SongFix VD prevent issues 03/46803/2
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-10 Francisco SantosRemove uniform mapping. 52/40852/2
2015-06-08 Francisco SantosMerge branch 'tizen' into devel/new_mesh 34/40734/2
2015-05-22 Adeel KazmiMerge "update bouncing-effect-actor to use new mesh...
2015-05-22 Xiangyin Maupdate bubble-emitter to use new mesh 61/39561/6