[dali_1.1.42] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-font-style.cpp
2016-06-03 Tom Robinson[dali_1.1.37] Merge branch 'devel/master' 18/73018/1
2016-06-02 Paul WisbeyMerge "Fix for object loader not handling flags correct...
2016-06-02 Seoyeon KimMerge "Prevention for being assigned NULL value" into...
2016-06-01 Paul WisbeyMerge "APIs for text editor." into devel/master
2016-05-31 Victor CebolladaAPIs for text editor. 03/66603/9
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 Victor CebolladaSvace issues. 95/68495/1
2016-01-15 Nick Holland[dali_1.1.17] Merge branch 'devel/master' 74/57174/1
2016-01-11 Paul WisbeyMerge "Markup procesor - Font." into devel/master
2016-01-08 Victor CebolladaMarkup procesor - Font. 00/53800/12