Merge branch 'master' of github.com:koreader/koreader

Browse Source

Conflicts:
	Makefile

...

This commit is contained in:

Qingping Hou

2013-03-24 17:39:46 -04:00

parent b096af45a2 61e48b8991

commit 969f98a61f

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