1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00

Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryShadow.java
	src/org/geometerplus/fbreader/library/AbstractLibrary.java
This commit is contained in:
Nikolay Pultsin 2013-01-05 01:34:42 +00:00
commit 2429198f4d
738 changed files with 1040 additions and 860 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2012 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2010-2013 Geometer Plus <contact@geometerplus.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by