14088 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Pultsin	4002cf7b5b	Merge branch 'ice-cream-sandwich' into yota2	2015-10-01 00:53:48 +01:00
Nikolay Pultsin	c0f22c5f5e	Merge branch 'master' into ice-cream-sandwich	2015-10-01 00:53:48 +01:00
Nikolay Pultsin	b995c9dd3c	sync with premium version	2015-10-01 00:53:29 +01:00
Nikolay Pultsin	c61b037ce9	Merge branch 'ice-cream-sandwich' into yota2	2015-09-30 20:09:07 +01:00
Nikolay Pultsin	68a4a41ede	Merge branch 'master' into ice-cream-sandwich	2015-09-30 20:09:06 +01:00
Nikolay Pultsin	3406bc5e8f	sync with premium version	2015-09-30 20:08:51 +01:00
Nikolay Pultsin	bdac80391e	Merge branch 'ice-cream-sandwich' into yota2	2015-09-30 19:51:16 +01:00
Nikolay Pultsin	509e3dedf8	Merge branch 'master' into ice-cream-sandwich	2015-09-30 19:51:11 +01:00
Nikolay Pultsin	2be210d0bb	sync with premium version	2015-09-30 19:49:14 +01:00
Nikolay Pultsin	601119a77b	Merge branch 'ice-cream-sandwich' into yota2	2015-09-29 18:38:15 +01:00
Nikolay Pultsin	26b8ed2fdc	Merge branch 'master' into ice-cream-sandwich	2015-09-29 18:38:14 +01:00
Nikolay Pultsin	d8094cc0da	new branch 2.6-nook	2015-09-29 18:38:02 +01:00
Nikolay Pultsin	e2b7c24911	Merge branch 'ice-cream-sandwich' into yota2	2015-09-29 18:35:44 +01:00
Nikolay Pultsin	9594bc2c31	Merge branch 'master' into ice-cream-sandwich	2015-09-29 18:35:43 +01:00
Nikolay Pultsin	fdc2abf4b0	new branches names	2015-09-29 18:35:32 +01:00
Nikolay Pultsin	873cfb3614	Merge branch 'ice-cream-sandwich' into yota2	2015-09-29 18:22:56 +01:00
Nikolay Pultsin	0f32a3437d	Merge branch 'master' into ice-cream-sandwich	2015-09-29 18:22:56 +01:00
Nikolay Pultsin	6a11c9df12	removed obsolete branches from merging	2015-09-29 18:22:48 +01:00
Nikolay Pultsin	1ff99c0db1	cleanup	2015-09-29 18:22:41 +01:00
Nikolay Pultsin	e9c2c42fd6	Merge branch 'ice-cream-sandwich' into yota2	2015-09-29 15:58:30 +01:00
Nikolay Pultsin	96aa807eaa	Merge branch 'master' into ice-cream-sandwich	2015-09-29 15:58:04 +01:00
Nikolay Pultsin	ed40de9822	directory renaming -- preparing for gradle build system	2015-09-29 15:55:40 +01:00
Nikolay Pultsin	2c1d5c53e2	directory renaming -- preparing for gradle build system	2015-09-29 15:54:34 +01:00
Nikolay Pultsin	69894abf4a	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 19:52:52 +01:00
Nikolay Pultsin	c9539723ad	Merge branch 'master' into ice-cream-sandwich	2015-09-25 19:52:51 +01:00
Nikolay Pultsin	e672bf6892	fixed NBSPACE processing	2015-09-25 19:52:18 +01:00
Nikolay Pultsin	79f24e0c71	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 19:01:36 +01:00
Nikolay Pultsin	f1e36604f8	Merge branch 'master' into ice-cream-sandwich	2015-09-25 19:01:33 +01:00
Nikolay Pultsin	2553ca4e9c	VERSION => 2.5.10	2015-09-25 19:01:08 +01:00
Nikolay Pultsin	5c975f9bd4	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 19:00:44 +01:00
Nikolay Pultsin	15a764f909	Merge branch 'master' into ice-cream-sandwich	2015-09-25 19:00:44 +01:00
Nikolay Pultsin	712db85457	updated ChangeLog	2015-09-25 19:00:34 +01:00
Nikolay Pultsin	d7c4133aa9	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 18:59:55 +01:00
Nikolay Pultsin	c543f247ce	Merge branch 'master' into ice-cream-sandwich	2015-09-25 18:59:55 +01:00
Nikolay Pultsin	f0f7b7d9a0	updated ChangeLog	2015-09-25 18:59:46 +01:00
Nikolay Pultsin	9fdfd7a5ab	do not close filechooser on long item click if nothing is selected	2015-09-25 18:58:50 +01:00
Nikolay Pultsin	209a3559a6	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 18:55:29 +01:00
Nikolay Pultsin	ffc95f39a2	Merge branch 'master' into ice-cream-sandwich	2015-09-25 18:55:29 +01:00
Nikolay Pultsin	605b5f12d5	second (external) sd card supported	2015-09-25 18:55:09 +01:00
Nikolay Pultsin	60ba70de18	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 14:42:18 +01:00
Nikolay Pultsin	8fc590853d	Merge branch 'master' into ice-cream-sandwich	2015-09-25 14:42:17 +01:00
Nikolay Pultsin	bd608b7e37	on-the-fly toc marks number update	2015-09-25 14:41:55 +01:00
Nikolay Pultsin	6eaeb7fd89	Merge branch 'ice-cream-sandwich' into yota2	2015-09-25 13:23:33 +01:00
Nikolay Pultsin	23ff908bfe	Merge branch 'master' into ice-cream-sandwich	2015-09-25 13:22:37 +01:00
Nikolay Pultsin	c1df1ccc52	'max number of TOC marks' option	2015-09-25 13:22:17 +01:00
Nikolay Pultsin	c1e745a69e	Merge branch 'ice-cream-sandwich' into yota2	2015-09-24 23:50:59 +01:00
Nikolay Pultsin	dbfd5ac284	Merge branch 'master' into ice-cream-sandwich	2015-09-24 23:50:59 +01:00
Nikolay Pultsin	5c1518fa93	typos	2015-09-24 23:50:52 +01:00
Nikolay Pultsin	cf967e00b6	fixed merge error	2015-09-24 22:25:40 +01:00
Nikolay Pultsin	d1e0aa7e5d	Merge branch 'ice-cream-sandwich' into yota2	2015-09-24 22:19:11 +01:00