Merge branch 'master' of github.com:kovidgoyal/calibre

Browse Source

Conflicts:
	src/calibre/ebooks/oeb/polish/tests/parsing.py

...

This commit is contained in:

Kovid Goyal 2013-10-23 20:53:49 +05:30

parent c20db472eb 966c5d572c

commit f03c4634f9

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

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

Diff Content Not Available