Lukasz Busko fixes merged into design3 branch
authorMateusz Żakowski <m.zakowski@samsung.com>
Fri, 9 Jan 2015 12:19:48 +0000 (13:19 +0100)
committerMateusz Żakowski <m.zakowski@samsung.com>
Fri, 9 Jan 2015 12:19:48 +0000 (13:19 +0100)
commit387d75573d19a0213bd69a05ee4911abea74bcb0
tree28d236a1f09c71e6fdc44f2019b4946f8c6ef9c8
parentb47f8bd27cc0e874978fdc3ab44135347393e8ad
parentf1dd27fb2e245ba7fbb7644ed72c7f21dd999ac0
Lukasz Busko fixes merged into design3 branch

Conflicts:
include/screen_reader_spi.h
include/screen_reader_tts.h
include/screen_reader_vconf.h
include/screen_reader_xml.h
include/xml_parser.h
org.tizen.smart-navigator.manifest
packaging/org.tizen.smart-navigator.spec
src/navigator.c
src/object_cache.c
src/screen_reader.c
src/screen_reader_spi.c
src/screen_reader_tts.c
src/screen_reader_vconf.c
src/screen_reader_xml.c
src/xml_parser.c
include/xml_parser.h
src/navigator.c