yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into library

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
This commit is contained in:
Nikolay Pultsin 2010-11-24 10:22:07 +00:00
commit 249e65b8c1
28 changed files with 24 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -19,8 +19,6 @@
package org.geometerplus.android.fbreader;
import java.util.HashMap;
import android.content.Intent;
import org.geometerplus.fbreader.fbreader.FBAction;