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-10 00:38:27 +04:00

parent 9c00839455 7fcbdf37a3

commit d59e03e56c

1 changed files with 1 additions and 1 deletions

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