[dali_1.1.33] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / flex-container / flex-container.h
2016-05-06 David Steele[dali_1.1.33] Merge branch 'devel/master' 81/68581/1
2016-05-05 Adeel KazmiMerge "Svace issues." into devel/master
2016-05-05 Richard HuangRemove flexPadding and flexBorder as DALi does not... 11/68511/1
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