1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 12:00:17 +02:00
Commit graph

78 commits

Author SHA1 Message Date
Nikolay Pultsin
7b5a2b68b0 Merge branch 'ice-cream-sandwich' into yota2 2015-10-20 02:18:19 +01:00
Nikolay Pultsin
5ad20eff4d Merge branch 'master' into ice-cream-sandwich 2015-10-20 02:18:19 +01:00
Nikolay Pultsin
865bf09da6 new resources used 2015-10-20 02:17:57 +01:00
Nikolay Pultsin
5dd54bb52a Merge branch 'ice-cream-sandwich' into yota2 2015-10-20 02:03:47 +01:00
Nikolay Pultsin
c759e70415 Merge branch 'master' into ice-cream-sandwich 2015-10-20 02:03:47 +01:00
Nikolay Pultsin
9af3f9ddfd natural order comparison 2015-10-14 16:39:50 +03:00
Nikolay Pultsin
5787ebafe4 Merge branch 'ice-cream-sandwich' into yota2 2015-10-13 23:06:37 +01:00
Nikolay Pultsin
72da8aaaf2 Merge branch 'master' into ice-cream-sandwich 2015-10-13 23:06:36 +01:00
Nikolay Pultsin
87ddf72ee1 no first line indent if align = center 2015-10-13 23:06:26 +01:00
Nikolay Pultsin
b579f73142 Merge branch 'ice-cream-sandwich' into yota2 2015-10-12 13:42:06 +01:00
Nikolay Pultsin
85e6cb1061 Merge branch 'master' into ice-cream-sandwich 2015-10-12 13:41:37 +01:00
Nikolay Pultsin
c796220ada sync with ics version 2015-10-12 13:40:19 +01:00
Nikolay Pultsin
354dcf1b78 Merge branch 'ice-cream-sandwich' into yota2 2015-10-12 12:46:27 +01:00
Nikolay Pultsin
ee2c23c0c4 own Pair implementation; ComparisonUtil 2015-10-12 12:45:48 +01:00
Nikolay Pultsin
52f5370508 Merge branch 'ice-cream-sandwich' into yota2 2015-10-11 07:55:33 +01:00
Nikolay Pultsin
d666da4ce8 Merge branch 'master' into ice-cream-sandwich 2015-10-11 07:55:32 +01:00
Nikolay Pultsin
04f0915e14 synch with premium version 2015-10-11 07:55:14 +01:00
Nikolay Pultsin
bdaf951024 Merge branch 'ice-cream-sandwich' into yota2 2015-10-10 22:20:03 +01:00
Nikolay Pultsin
485048a55a ViewUtil moved to org.fbreader.util.android 2015-10-10 22:19:34 +01:00
Nikolay Pultsin
ea68588f19 Merge branch 'ice-cream-sandwich' into yota2 2015-10-10 06:25:58 +01:00
Nikolay Pultsin
e280c6f4bd Merge branch 'master' into ice-cream-sandwich 2015-10-10 06:25:53 +01:00
Nikolay Pultsin
3c4364f2e1 fixed missing book notification behaviour 2015-10-10 06:22:39 +01:00
Nikolay Pultsin
146fe78e06 fixed missing book notification behaviour 2015-10-10 06:16:04 +01:00
Nikolay Pultsin
9a97c6abd6 Merge branch 'ice-cream-sandwich' into yota2 2015-10-07 20:59:51 +01:00
Nikolay Pultsin
fd3f3b01c0 Merge branch 'master' into ice-cream-sandwich 2015-10-07 20:59:45 +01:00
Nikolay Pultsin
643824fd75 MotionEvent.ACTION_CANCEL processing 2015-10-07 20:58:11 +01:00
Nikolay Pultsin
4fcfea5b55 Merge branch 'ice-cream-sandwich' into yota2 2015-10-07 14:20:20 +01:00
Nikolay Pultsin
47efd8aa6f used android.util.Pair 2015-10-07 14:16:14 +01:00
Nikolay Pultsin
a1c9e774e7 used android.util.Pair 2015-10-07 14:14:53 +01:00
Nikolay Pultsin
5bb82cb880 Merge branch 'ice-cream-sandwich' into yota2 2015-10-07 02:57:13 +01:00
Nikolay Pultsin
8b432b50b4 Merge branch 'master' into ice-cream-sandwich 2015-10-07 02:57:12 +01:00
Nikolay Pultsin
140d22954b ZLBoolean3 => org.fbreader.util.Boolean3 2015-10-07 02:56:43 +01:00
Nikolay Pultsin
4060b3b5a9 Merge branch 'ice-cream-sandwich' into yota2 2015-10-07 02:34:58 +01:00
Nikolay Pultsin
8b43a0fbe3 Merge branch 'master' into ice-cream-sandwich 2015-10-07 02:34:57 +01:00
Nikolay Pultsin
c4c7f6411b unused class 2015-10-07 02:34:45 +01:00
Nikolay Pultsin
7a35c977bf Merge branch 'ice-cream-sandwich' into yota2 2015-10-03 20:31:49 +01:00
Nikolay Pultsin
5553c1f53b Merge branch 'master' into ice-cream-sandwich 2015-10-03 20:31:45 +01:00
Nikolay Pultsin
9692891329 org.fbreader.util.Pair class 2015-10-03 20:31:11 +01:00
Nikolay Pultsin
98990233e4 Merge branch 'ice-cream-sandwich' into yota2 2015-10-03 20:26:08 +01:00
Nikolay Pultsin
70463491fa Merge branch 'master' into ice-cream-sandwich 2015-10-03 20:26:07 +01:00
Nikolay Pultsin
e8ca506145 org.fbreader.util.Pair class 2015-10-03 20:25:50 +01:00
Nikolay Pultsin
8e8edbe417 org.fbreader.util.Pair class 2015-10-03 20:18:16 +01:00
Nikolay Pultsin
03335da04e Merge branch 'master' into ice-cream-sandwich 2015-10-02 17:10:32 +01:00
Nikolay Pultsin
59ab72f4ca Merge branch 'ice-cream-sandwich' into yota2 2015-10-02 17:10:32 +01:00
Nikolay Pultsin
ea3d413117 unused field 2015-10-02 17:10:24 +01:00
Nikolay Pultsin
29e1f46153 Merge branch 'master' into ice-cream-sandwich 2015-10-02 01:13:20 +01:00
Nikolay Pultsin
f3f924337a Merge branch 'ice-cream-sandwich' into yota2 2015-10-02 01:13:20 +01:00
Nikolay Pultsin
6942b90efb unused field 2015-10-02 01:13:14 +01:00
Nikolay Pultsin
4182c1f752 better errormessage 2015-10-01 20:46:50 +01:00
Nikolay Pultsin
48bfc1b384 Merge branch 'ice-cream-sandwich' into yota2 2015-10-01 19:38:22 +01:00