Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / alpha-discard-effect.h
2016-12-13 suhyung EomMerge "Merge branch 'devel/master(1.2.18)' into tizen...
2016-12-13 suhyung EomMerge branch 'devel/master(1.2.18)' into tizen 83/104483/1
2016-12-02 minho.sunMerge "Add focus indicator only when attaching physical...
2016-12-01 Adeel KazmiChanges after ShaderEffect removal 06/101606/2
2016-08-09 taeyoonMerge branch 'devel/master (1.2.0)' into tizen 08/83208/1
2016-07-29 Adeel Kazmi(Visuals) Added visual indices 99/80299/18
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-17 Paul WisbeyMerge "Adding TextField Popup behaviour to (Programming...
2015-11-17 Kimmo HoikkaMerge "Changed button to use ImageView instead of Image...
2015-11-17 Chu HoangChanged button to use ImageView instead of ImageActor... 40/51740/13
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