[dali_1.1.7] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / dissolve-effect.h
2015-10-23 Lee Morgan[dali_1.1.7] Merge branch 'devel/master' 39/50039/1
2015-10-15 Kimmo HoikkaMerge "Changed NPatchRenderer and ImageRenderer to...
2015-10-14 Kimmo HoikkaMerge "Changed Distance Field effect effect to use...
2015-10-14 Chu HoangChanged Distance Field effect effect to use new custom... 28/49528/4
2015-10-02 Paul WisbeyMerge "Fix the cursor position when retrieving the...
2015-10-02 Chu Hoang[dali_1.1.5] Merge branch 'devel/master' 79/48979/1
2015-10-01 Kimmo HoikkaMerge "Implemented custom shader in ImageRenderer and...
2015-10-01 Chu HoangImplemented custom shader in ImageRenderer and changed... 87/48787/6
2015-07-01 Ferran Sole[dali_1.0.47] Merge branch 'devel/master' 97/42697/1
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 Andrew CoxFixup for core removal of GeometryType and ShaderSubTypes 41/40841/2
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-29 Adeel Kazmi[dali_1.0.42] Merge branch 'tizen' 11/40111/1
2015-05-19 Nick HollandMove more public-api headers to devel-api. PART 3 55/39555/2