Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / distance-field-effect.cpp
2017-02-27 suhyung EomMerge branch 'devel/master' into tizen 38/116538/1
2017-02-27 suhyung EomRevert "[Tizen] Remove dead distance-field-effect.cpp... 37/116537/1
2017-02-09 minho.sun[Tizen] Remove dead distance-field-effect.cpp file 13/113813/2
2017-02-09 minho.sunMerge branch 'devel/master' into tizen 11/113811/1
2017-02-09 minho.sunRevert "[Tizen] Remove dead distance-field-effect.cpp... 09/113809/1
2017-01-20 Seoyeon Kim[Tizen] Remove dead distance-field-effect.cpp file 57/111257/1
2017-01-20 Seoyeon KimMerge branch 'devel/master' into tizen 14/111214/1
2017-01-20 Seoyeon KimRevert "[Tizen] Remove dead distance-field-effect.cpp... 00/111200/1
2017-01-04 Seoyeon Kim[Tizen] Remove dead distance-field-effect.cpp file 71/108371/1
2017-01-04 Seoyeon KimMerge branch 'devel/master' into tizen 39/108339/1
2017-01-04 Seoyeon KimRevert "[Tizen] Remove dead distance-field-effect.cpp... 30/108330/1
2016-12-13 suhyung Eom[Tizen] Remove dead distance-field-effect.cpp file 22/104522/1
2016-12-13 suhyung EomMerge branch 'devel/master(1.2.18)' into tizen 83/104483/1
2016-12-13 suhyung EomRevert "[3.0] Remove dead distance-field-effect.cpp... 78/104478/1
2016-12-13 suhyung EomRevert "[3.0] Remove dead distance-field-effect.cpp... 16/104416/1
2016-11-15 dongsug.song[3.0] Remove dead distance-field-effect.cpp file 78/97778/1
2016-11-15 dongsug.songMerge branch 'devel/master' into tizen 76/97776/1
2016-11-15 dongsug.songRevert "[3.0] Remove dead distance-field-effect.cpp... 49/97749/1
2016-08-29 Agnelo Vaz[3.0] Remove dead distance-field-effect.cpp file 54/85354/3
2016-08-09 taeyoonMerge branch 'devel/master (1.2.0)' into tizen 08/83208/1
2016-06-18 taeyoonMerge branch 'devel/master(1.1.39)' into tizen 15/75415/1
2016-05-31 suhyung EomMerge branch 'devel/master' into tizen 75/72275/1
2016-05-18 minho.sunMerge branch 'devel/master' into tizen 20/71020/1
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-19 Seoyeon KimMerge branch 'devel/master' into tizen 56/66456/1 accepted/tizen/common/20160427.144351 accepted/tizen/ivi/20160428.002713 accepted/tizen/mobile/20160428.004938 accepted/tizen/tv/20160428.002515 accepted/tizen/wearable/20160428.002803 submit/tizen/20160427.082119
2016-04-05 suhyung EomMerge branch 'devel/master' (1.1.28) into tizen 52/64852/1 accepted/tizen/common/20160411.125807 accepted/tizen/ivi/20160411.051259 accepted/tizen/mobile/20160411.051235 accepted/tizen/tv/20160411.051209 accepted/tizen/wearable/20160411.051133 submit/tizen/20160411.012820
2016-03-21 minho.sunMerge branch 'devel/master' into tizen 12/62912/1 accepted/tizen/common/20160323.184847 accepted/tizen/ivi/20160323.140635 accepted/tizen/mobile/20160323.135022 accepted/tizen/mobile/20160323.223933 accepted/tizen/tv/20160323.135440 accepted/tizen/tv/20160323.223917 accepted/tizen/wearable/20160323.135138 accepted/tizen/wearable/20160323.223948 submit/tizen/20160323.065919 submit/tizen_mobile/20160323.222707 submit/tizen_tv/20160323.222827 submit/tizen_wearable/20160323.222755
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-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-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-09-01 taeyoonMerge branch 'devel/master(1.1.1)' into tizen 18/47218/1 accepted/tizen/mobile/20151022.072943 accepted/tizen/tv/20151022.073009 accepted/tizen/wearable/20151022.073028 submit/tizen/20151022.022818 submit/tizen_mobile/20151022.013557 submit/tizen_tv/20151022.055445 submit/tizen_wearable/20151022.055709
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-23 Kimmo HoikkaRemove dali-any from Property::Value - reimplement...
2015-06-22 Adeel KazmiMerge "UTC added for Text, Multi-language." into devel...
2015-06-15 Kimmo HoikkaRemove dali-any from Property::Value 58/41358/2
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