48 commits

Author	SHA1	Message	Date
Nikolay Pultsin	e2ea97fb92	removed obsolete branches	2015-05-04 12:01:18 +01:00
Nikolay Pultsin	94e45c6108	lr branches have gone	2015-04-19 00:54:26 +01:00
Nikolay Pultsin	56d500a51c	updated merge process	2015-01-15 19:11:47 +00:00
Nikolay Pultsin	c70c34aa89	intro branches have gone	2014-12-31 04:02:37 +00:00
Nikolay Pultsin	2cc65518d8	new branches	2014-12-27 07:18:28 +00:00
Nikolay Pultsin	e8b4b686f1	intro branches	2014-12-10 17:32:36 +00:00
Nikolay Pultsin	b28987edd2	obsolete branch	2014-07-01 21:45:42 +01:00
Nikolay Pultsin	3aa7d6ed88	obsolete branch	2014-06-29 17:39:15 +01:00
Nikolay Pultsin	01bdd62947	new branches	2014-06-06 07:47:26 +01:00
Nikolay Pultsin	a8b7af1db9	no more fc branches	2014-04-21 19:59:15 +01:00
Nikolay Pultsin	ec96ce8dd8	new branches	2014-04-14 04:29:38 +01:00
Nikolay Pultsin	d7af2c58d5	added filechooser branch	2014-04-07 01:33:15 +01:00
Nikolay Pultsin	638ad6a78b	updated util scripts	2014-03-17 02:24:57 +02:00
Nikolay Pultsin	920e2a1c73	new branches	2014-03-12 11:35:59 +00:00
Nikolay Pultsin	87a7839ba4	added betayota branch to the auto-merge list	2014-03-06 15:09:13 +00:00
Nikolay Pultsin	149bb759fc	yotabeta branch in standard list	2014-02-09 02:20:23 +04:00
Nikolay Pultsin	740e672a83	plugins & plugins-ics branch have gone	2014-01-12 20:03:16 +00:00
Nikolay Pultsin	a6dec0722d	new branches	2014-01-04 21:36:56 +00:00
Nikolay Pultsin	9b373ea150	added kindle branch	2013-12-29 10:40:29 +02:00
Nikolay Pultsin	e5d39b2656	updated scripts	2013-12-22 17:18:04 +00:00
Nikolay Pultsin	8aa7f95c37	yota branch has gone	2013-12-08 10:54:29 +00:00
Nikolay Pultsin	483382c47d	new branch yota2	2013-11-23 11:17:02 +00:00
Nikolay Pultsin	dc2e07959d	no new-book-event branch	2013-11-19 05:16:45 +00:00
Nikolay Pultsin	16250c29d3	new branches	2013-10-27 01:16:32 +02:00
Nikolay Pultsin	f68e57c042	new actual branches	2013-10-25 17:26:49 +01:00
Nikolay Pultsin	619bd45b97	VERSION => 1.9.1	2013-10-15 14:29:10 +01:00
Nikolay Pultsin	17d2850a89	cs-catalogs-reorder branch has gone	2013-10-07 13:56:47 +01:00
Nikolay Pultsin	8098729664	ics-catalogs branch has gone	2013-10-06 16:21:40 +01:00
Nikolay Pultsin	e3a23d22a9	actual branches	2013-10-05 13:57:25 +01:00
Nikolay Pultsin	5cc7fd6268	actual branches	2013-10-05 13:56:24 +01:00
Nikolay Pultsin	a34f1f4577	version for android 1.5 has gone	2013-09-23 22:36:28 +01:00
Nikolay Pultsin	cf42fb1591	a rollback: my git does not know about --no-edit option	2013-07-25 00:37:12 +01:00
Nikolay Pultsin	aef32b160d	--no-edit merge option	2013-03-23 18:30:16 +04:00
Nikolay Pultsin	2e740d9c3b	library-service* branches have gone (merged into master/ics)	2013-02-14 02:58:48 +04:00
Nikolay Pultsin	d8fbb9a2eb	multidirs branch has gone	2013-02-10 21:03:20 +04:00
Nikolay Pultsin	91a3c2720b	merge order	2013-02-01 19:49:44 +00:00
Nikolay Pultsin	7c9f96a9d1	merge order	2013-02-01 11:18:12 +00:00
Nikolay Pultsin	c207b09df5	merge order	2013-01-20 05:16:16 +04:00
Nikolay Pultsin	e4b0b64ffa	merge order	2013-01-19 22:00:44 +04:00
Nikolay Pultsin	3b7592625f	booksdb branches have gone	2013-01-11 07:01:20 +04:00
Nikolay Pultsin	584559c686	merge order	2012-05-03 23:54:43 +01:00
Nikolay Pultsin	06209c7751	VERSION => 1.5	2012-05-01 18:57:15 +01:00
Nikolay Pultsin	da8a8d44af	ics first	2012-04-21 08:57:04 +01:00
Nikolay Pultsin	1dbcecc5fe	added epub-native-ics branch	2012-04-15 19:43:04 +01:00
Nikolay Pultsin	8ef3d553c4	more branches for synchronization	2012-04-07 23:35:38 +01:00
Nikolay Pultsin	eb1a54c78a	external-formats in merged into beta and has gone	2012-03-28 19:06:27 +01:00
Nikolay Pultsin	834e6cff22	native => beta	2012-03-28 18:59:18 +01:00
Nikolay Pultsin	88de28682e	obsolete files; useful script	2012-03-24 11:24:19 +00:00