[dali_2.3.21] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / markup-processor.cpp
2016-01-15 Nick Holland[dali_1.1.17] Merge branch 'devel/master' 74/57174/1
2016-01-12 Victor CebolladaConvert CR or CR+LF to LF. 70/46070/3
2016-01-11 Paul WisbeyMerge "Markup procesor - Font." into devel/master
2016-01-08 Victor CebolladaMarkup procesor - Font. 00/53800/12
2015-12-23 Adeel Kazmi[dali_1.1.15] Merge branch 'devel/master' 29/55429/1
2015-12-17 Victor CebolladaMarkup procesor. Color 98/53798/10
2015-12-16 Victor CebolladaMarkup processor. 89/52689/15