Merge branch 'devel/master( 1.1.16 )' into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / markup-processor.h
2016-01-15 taeyoonMerge branch 'devel/master( 1.1.16 )' into tizen 77/57077/1 accepted/tizen/mobile/20160122.080625 accepted/tizen/tv/20160122.082337 accepted/tizen/wearable/20160122.082359 submit/tizen_common/20160122.071605 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
2015-12-17 Victor CebolladaMarkup procesor. Color 98/53798/10
2015-12-16 Victor CebolladaMarkup processor. 89/52689/15