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

Merge branch 'master' into ice-cream-sandwich

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
This commit is contained in:
Nikolay Pultsin 2013-02-01 15:59:04 +00:00
commit 38049e71a5
103 changed files with 503 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/android/patches/JellyBeanSpanFixTextView.java
View file

@ -27,9 +27,9 @@ import android.widget.TextView;
* but it should only happen once per text change.
* <p>
* See http://code.google.com/p/android/issues/detail?id=35466
*
*
* @author "Pierre-Yves Ricau" <py.ricau@gmail.com>
*
*
*/
public class JellyBeanSpanFixTextView extends TextView {