Merge branch 'master' into library-service

Browse source

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

...

This commit is contained in:

Nikolay Pultsin 2013-02-01 20:07:33 +00:00

parent 1761ef83a8 a235ea9a9b

commit 9300f21717

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