Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / logical-model-impl.h
2016-02-26 dongsug.songMerge branch 'devel/master' into tizen 39/60139/2 accepted/tizen/common/20160302.194024 accepted/tizen/ivi/20160302.073519 accepted/tizen/mobile/20160302.073314 accepted/tizen/tv/20160302.073350 accepted/tizen/wearable/20160302.073454 submit/tizen/20160226.050754 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
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
2016-01-11 Paul WisbeyMerge "Markup procesor - Font." into devel/master
2016-01-08 Victor CebolladaMarkup procesor - Font. 00/53800/12
2015-12-17 Victor CebolladaMarkup procesor. Color 98/53798/10
2015-09-01 taeyoonMerge branch 'devel/master(1.1.1)' into tizen 18/47218/1 accepted/tizen/mobile/20151022.072943 accepted/tizen/tv/20151022.073009 accepted/tizen/wearable/20151022.073028 submit/tizen/20151022.022818 submit/tizen_mobile/20151022.013557 submit/tizen_tv/20151022.055445 submit/tizen_wearable/20151022.055709
2015-08-19 taeyoonMerge branch devel/master(1.0.49) into tizen 65/46365/1 tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_temp accepted/tizen/mobile/20150820.115740 accepted/tizen/mobile/20150820.115828 accepted/tizen/tv/20150820.115858 accepted/tizen/wearable/20150820.120006 submit/tizen/20150820.112512 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_mobile/20150820.095541 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
2015-07-28 Adeel KazmiMerge "Stop setting crazy Z value with controls (at...
2015-07-28 Paul WisbeyMerge "Text clean." into devel/master
2015-07-28 Victor CebolladaText clean. 22/44422/6
2015-06-26 Francisco SantosMerge branch 'devel/master' into devel/new_mesh 13/42313/3
2015-06-25 Adeel KazmiMerge "Add support for new accessibility actions" into...
2015-06-22 Adeel KazmiMerge "UTC added for Text, Multi-language." into devel...
2015-06-22 Victor CebolladaText logical and visual models. Remove unused/unwanted... 27/42027/1
2015-04-20 Francisco SantosRevert to tizen branch. 19/38419/1
2015-04-09 Paul WisbeyMerge branch 'new_text' into tizen 33/38033/2
2015-04-09 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 10/38010/1
2015-04-09 Paul WisbeyMerge "Calculate the visual to logical cursor position...
2015-04-07 Victor CebolladaCalculate the visual to logical cursor position convers... 99/37599/3
2015-04-07 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 49/37849/2
2015-03-31 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 36/37536/6
2015-03-23 Paul WisbeyMerge "Added metrics logging to TextAtlasRenderer"...
2015-03-20 Paul WisbeyMerge "Retrieves character's directions." into new_text
2015-03-20 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 11/37211/2
2015-03-20 Victor CebolladaRetrieves character's directions. 33/37133/3
2015-03-19 Paul WisbeyMerge remote-tracking branch 'origin/tizen' into new_text 09/37109/2
2015-03-17 Paul WisbeyMerge "Improved block detection for new atlases in...
2015-03-17 Victor CebolladaInternal text model inteface. 43/36943/6