Merge branch 'ges-detect' of github.com:houqp/kindlepdfviewer into ges-detect

Browse Source

Conflicts:
	frontend/ui/menu.lua

...

This commit is contained in:

Qingping Hou

2012-11-11 14:32:36 +08:00

parent 5e2537210f d8568520c0

commit 04942f9d94

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available