renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into djvu-highlight

Browse Source 
Conflicts:
	unireader.lua
This commit is contained in:
Qingping Hou
2012-03-27 02:50:15 +08:00
parent 8159b24a46 b496c2081f
commit d37e81ad0c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -3,10 +3,13 @@ lua
lua-*
.reader.kpdfview.lua
mupdf-thirdparty.zip
djvulibre*
kpdfview
*.o
kindlepdfviewer-*.zip
/.cproject
/.project
/.reader.kpdfview

2
unireader.lua
View File

@@ -1044,7 +1044,7 @@ function UniReader:addAllCommands()
unireader:showHighLight()
unireader:goto(unireader.pageno)
end)
self.commands:add(KEY_HOME,MOD_SHIFT_OR_ALT,"Home",
self.commands:add(KEY_HOME,nil,"Home",
"exit application",
function(unireader)
keep_running = false