Merge branch 'master' into library-service

Browse source

Conflicts:
	src/org/geometerplus/fbreader/book/Book.java
	src/org/geometerplus/fbreader/library/Library.java

...

This commit is contained in:

Nikolay Pultsin 2013-01-14 07:06:25 +04:00

parent 5fcab45f82 e588c37b3b

commit 60fbf55a66

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 is not available