Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-demo.git] / resources / scripts / animated-colors.json
2016-08-09 taeyoonMerge branch 'devel/master (1.2.0)' into tizen 13/83213/1
2016-07-29 Adeel Kazmi[dali_1.1.45] Merge branch 'devel/master' 13/82113/1
2016-07-29 Adeel KazmiUpdates following Visual Property Changes 67/81667/3
2016-07-22 Adeel KazmiMerge "Tizen Directory Migration" into devel/master
2016-07-22 Richard Huang[dali_1.1.44] Merge branch 'devel/master' 09/81209/1
2016-07-19 Adeel KazmiUpdates after Renderer Type values changed 70/80670/1
2016-05-18 minho.sunMerge branch 'devel/master' into tizen 24/71024/1 accepted/tizen/common/20160524.150524 accepted/tizen/common/20160525.160509 accepted/tizen/ivi/20160525.062209 accepted/tizen/ivi/20160526.003816 accepted/tizen/mobile/20160525.062309 accepted/tizen/mobile/20160526.003648 accepted/tizen/tv/20160525.062140 accepted/tizen/tv/20160526.003723 accepted/tizen/wearable/20160525.062236 accepted/tizen/wearable/20160526.003748 submit/tizen/20160524.015112 submit/tizen/20160525.015808 submit/tizen/20160525.140602
2016-05-06 David Steele[dali_1.1.33] Merge branch 'devel/master' 82/68582/1
2016-04-29 Paul WisbeyBlending enum clean-up 11/67011/5
2016-04-20 Seoyeon KimMerge branch 'devel/master' into tizen 42/66642/1 accepted/tizen/common/20160427.144413 accepted/tizen/ivi/20160428.002736 accepted/tizen/mobile/20160428.004958 accepted/tizen/tv/20160428.002537 accepted/tizen/wearable/20160428.002827 submit/tizen/20160427.082119
2016-04-08 Xiangyin Ma[dali_1.1.29] Merge branch 'devel/master' 27/65327/1
2016-04-06 Adeel KazmiCleaned up some & removed redundant JSON scripts, as... 78/64978/7
2016-01-15 taeyoonMerge branch 'devel/master( 1.1.16 )' into tizen 81/57081/1 accepted/tizen/common/20160208.162649 accepted/tizen/ivi/20160218.023821 accepted/tizen/mobile/20160122.080639 accepted/tizen/tv/20160122.082355 accepted/tizen/wearable/20160122.082418 submit/tizen_common/20160122.071605 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000003 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
2015-11-06 Tom Robinson[dali_1.1.9] Merge branch 'devel/master' 13/51313/1
2015-11-03 Adeel KazmiChanges following the property & singal name changes 36/50836/4
2015-10-26 taeyoonMerge branch 'devel/master(1.1.2 ~ 1.1.7)' into tizen 40/50140/1 accepted/tizen/common/20151218.120158 accepted/tizen/mobile/20151102.112646 accepted/tizen/tv/20151102.112713 accepted/tizen/wearable/20151102.112736 submit/tizen/20151102.084015 submit/tizen_common/20151209.063055
2015-09-18 Xiangyin Ma[dali_1.1.3] Merge branch 'devel/master' 56/48356/1
2015-09-17 Xiangyin MaUpdate the scripts with the changed control property... 95/48295/2
2015-09-01 taeyoonMerge branch 'devel/master(1.1.1)' into tizen 19/47219/1 accepted/tizen/mobile/20151022.072957 accepted/tizen/tv/20151022.073022 accepted/tizen/wearable/20151022.073041 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 74/46374/1 tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_temp accepted/tizen/mobile/20150820.115818 accepted/tizen/mobile/20150820.115841 accepted/tizen/tv/20150820.115913 accepted/tizen/wearable/20150820.120020 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-07-30 Tom Robinson[dali_1.0.51] Merge branch 'devel/master' 88/44988/1
2015-07-27 Adeel KazmiMerge "Fixed 4 demo json scripts" into devel/master
2015-07-27 Tom RobinsonFixed 4 demo json scripts 92/44692/2
2015-07-17 Nick Holland[dali_1.0.49] Merge branch 'devel/master' 58/44158/1
2015-07-13 Richard HuangChange DrawMode::OVERLAY to DrawMode::OVERLAY_2D 52/43752/1
2015-06-08 Francisco SantosMerge remote-tracking branch 'origin/tizen' into devel... 37/40737/1
2015-06-04 Richard Huang[dali_1.0.43] Merge branch 'tizen' 95/40495/1
2015-06-02 Kimmo HoikkaChanges after 40127, changing control background to 0.f 74/40274/2
2015-04-28 Francisco SantosMerge branch 'tizen' into devel/new_mesh 84/38784/1
2015-04-10 Kingsley Stephens[dali_1.0.37] Merge branch 'tizen' 86/38086/1
2015-04-09 Paul WisbeyMerge branch 'new_text' into tizen 29/38029/1
2015-04-09 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 28/38028/1
2015-04-09 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 12/38012/1
2015-04-07 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 50/37850/3
2015-04-07 Paul WisbeyUpdating the builder examples to use TextLabel 06/37706/2
2015-04-03 Adeel Kazmi[dali_1.0.36] Merge branch 'tizen' 32/37732/1
2015-03-31 David SteeleMerge branch 'tizen' into devel/new_mesh 95/37595/2
2015-03-31 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 46/37546/10
2015-03-30 Adeel KazmiMerge "Size negotiation example" into tizen
2015-03-26 Kingsley StephensSize negotiation example 75/36275/8
2015-03-04 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 11/36311/3
2015-03-04 Lee Morgan[dali_1.0.32] Merge branch 'tizen' 00/36300/1
2015-03-02 HyunJu ShinMerge "Change a label of check box button" into tizen
2015-02-26 Adeel KazmiReorganised folders & examples automatically built 66/35966/5