Hzj_jie 016aaa92b9 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	frontend/docsettings.lua

2016-06-06 08:56:07 -07:00

..

benchmark.lua

…

cache_spec.lua

…

commonrequire.lua

…

dbg_spec.lua

…

defaults_spec.lua

…

device_spec.lua

…

docsettings_spec.lua

Merge remote-tracking branch 'upstream/master'

2016-06-06 08:56:07 -07:00

document_spec.lua

…

eink_optimization_spec.lua

…

filemanager_spec.lua

filemanager(refactor): use purge method from docsettings

2016-06-03 22:06:02 -07:00

font_spec.lua

…

gesturerange_spec.lua

…

httpclient_spec.lua

…

imagewidget_spec.lua

…

koptinterface_spec.lua

…

kosync_spec.lua

…

nickel_conf_spec.lua

test(fix): clean up after screenshot test

2016-06-01 21:32:35 -07:00

opds_spec.lua

…

readerbookmark_spec.lua

filemanager(refactor): use purge method from docsettings

2016-06-03 22:06:02 -07:00

readerdictionary_spec.lua

…

readerfooter_spec.lua

…

readerhighlight_spec.lua

…

readerlink_spec.lua

…

readerpaging_spec.lua

…

readerrolling_spec.lua

…

readersearch_spec.lua

…

readertoc_spec.lua

…

readerui_spec.lua

filemanager(refactor): use purge method from docsettings

2016-06-03 22:06:02 -07:00

readerview_spec.lua

…

screenshoter_spec.lua

test(fix): clean up after screenshot test

2016-06-01 21:32:35 -07:00

spore_spec.lua

…

textboxwidget_spec.lua

dictquicklookup(fix): use self.region for matching hold event

2016-06-05 00:08:23 -07:00

touch_probe_spec.lua

…

uimanager_bench.lua

…

uimanager_spec.lua

…

util_spec.lua

textboxwidget(fix): handle onHoldWord event

2016-06-05 00:37:54 -07:00

verbose_print.lua

…

widget_menu_spec.lua

…

widget_progresswidget_spec.lua

…