Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / flex-container / flex-container-impl.h
2018-05-18 Heeyong SongMerge branch 'devel/master' into tizen 33/179433/1
2018-05-17 Anton ObzhirovRebase of facebook flexbox to yoga 01/179101/4
2018-01-30 Seoyeon KimMerge branch 'devel/master' into tizen 82/168682/1
2017-11-24 David SteeleMerge "Add Delete Key event in TextController" into...
2017-11-23 Jinho, LeeMerge "Fixed the appearance of a bold text when setting...
2017-11-22 Adeel KazmiMerge "ImageView example code correction" into devel...
2017-11-22 taeyoon0.leeMerge "Removed unused member" into devel/master
2017-11-21 taeyoon0.leeRTL support of FlexContainer 82/151882/35
2017-11-14 Heeyong SongMerge branch 'devel/master' into tizen 46/159946/1
2017-09-29 Adeel KazmiMerge "Changes required after WeakHandle moved to Publi...
2017-09-28 Adeel KazmiChanges required after WeakHandle moved to Public API... 32/153532/2
2017-01-20 Seoyeon KimMerge branch 'devel/master' into tizen 14/111214/1
2017-01-09 Adeel KazmiMerge "Fix the warning log in Control causing the wrong...
2017-01-06 Adeel KazmiMerge "Added nested TableView KeyboardFocus support...
2017-01-06 Adeel KazmiMerge "DALi Version 1.2.21" into devel/master
2017-01-06 Kimmo HoikkaMerge "Make Up calls to control consistent so they...
2017-01-06 Adeel KazmiMake Up calls to control consistent so they are called... 97/107897/9
2016-08-09 taeyoonMerge branch 'devel/master (1.2.0)' into tizen 08/83208/1
2016-08-09 taeyoonRevert "[3.0] Put third party source files in separate... 00/83200/1
2016-07-11 minho.sunMerge "[3.0] Tizen Directory Migration" into tizen accepted/tizen/common/20160711.170612 accepted/tizen/ivi/20160711.084810 accepted/tizen/mobile/20160711.084853 accepted/tizen/tv/20160711.084625 accepted/tizen/wearable/20160711.084736 submit/tizen/20160711.050618
2016-07-07 Seoyeon KimMerge "[3.0] Update dali-toolkit-doc.h for new features... accepted/tizen/common/20160707.171812 accepted/tizen/ivi/20160707.043629 accepted/tizen/mobile/20160707.043732 accepted/tizen/tv/20160707.043548 accepted/tizen/wearable/20160707.043657 submit/tizen/20160707.033419
2016-07-05 Adeel Kazmi[3.0] Put third party source files in separate folder... 61/78361/3 accepted/tizen/common/20160705.170833 accepted/tizen/ivi/20160706.014131 accepted/tizen/mobile/20160706.014016 accepted/tizen/tv/20160706.014043 accepted/tizen/wearable/20160706.014107 submit/tizen/20160705.094122
2016-06-22 Adeel KazmiPut third party source files in separate folder & exclu... 38/76038/1
2016-05-31 suhyung EomMerge branch 'devel/master' into tizen 75/72275/1
2016-05-19 Adeel KazmiMerge "Make FlexContainer as public API" into devel...
2016-05-19 Richard HuangMake FlexContainer as public API 60/68960/5
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-28 Kimmo HoikkaMerge "Moved StyleManager to the public API" into devel...
2016-04-28 Adeel KazmiMerge "Remove ImageActor from Builder & some doxygen...
2016-04-27 Adeel KazmiMerge "Fix doxygen errors and enable doxygen build...
2016-04-27 Richard HuangFix doxygen errors and enable doxygen build for devel-api 67/67467/3
2016-04-19 Kimmo HoikkaMerge "Flexbox UI control implementation" into devel...
2016-04-18 Richard HuangFlexbox UI control implementation 53/59953/12