[dali_1.2.22] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / flex-container / flex-container-impl.h
2017-01-13 David Steele[dali_1.2.22] Merge branch 'devel/master' 97/110297/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-06-24 Victor Cebollada[dali_1.1.40] Merge branch 'devel/master' 57/76557/1
2016-06-22 Adeel KazmiPut third party source files in separate folder & exclu... 38/76038/1
2016-05-20 Nick Holland[dali_1.1.35] Merge branch 'devel/master' 56/70756/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-04-29 Agnelo Vaz[dali_1.1.32] Merge branch 'devel/master' 30/67930/1
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-22 Adeel Kazmi[dali_1.1.31] Merge branch 'devel/master' 73/66973/1
2016-04-19 Kimmo HoikkaMerge "Flexbox UI control implementation" into devel...
2016-04-18 Richard HuangFlexbox UI control implementation 53/59953/12