120 commits

Author	SHA1	Message	Date
Nikolay Pultsin	d8094cc0da	new branch 2.6-nook	2015-09-29 18:38:02 +01:00
Nikolay Pultsin	fdc2abf4b0	new branches names	2015-09-29 18:35:32 +01:00
Nikolay Pultsin	6a11c9df12	removed obsolete branches from merging	2015-09-29 18:22:48 +01:00
Nikolay Pultsin	ed09c77cdc	settings dialog title	2015-09-24 18:59:00 +01:00
Nikolay Pultsin	ab62fd0a84	2.6-kindle branch	2015-08-22 15:08:24 +01:00
Nikolay Pultsin	d740614698	branch renaming	2015-08-09 23:05:00 +02:00
Nikolay Pultsin	ae9716fa06	new branches	2015-08-07 03:31:53 +02:00
Nikolay Pultsin	3249f02f45	more pytonish + replace non-translated values changed in base	2015-06-14 22:51:05 +01:00
Nikolay Pultsin	e2ea97fb92	removed obsolete branches	2015-05-04 12:01:18 +01:00
Nikolay Pultsin	eff5fb1915	resources sync	2015-04-21 22:59:08 +01:00
Nikolay Pultsin	94e45c6108	lr branches have gone	2015-04-19 00:54:26 +01:00
Nikolay Pultsin	cf0838bd2a	no lr branches more	2015-04-17 08:38:22 +01:00
Nikolay Pultsin	52718c1331	lr branches go away	2015-04-16 00:49:04 +01:00
Nikolay Pultsin	44becfe34c	Merge branch 'master' into lr	2015-02-28 15:17:30 +01:00
Nikolay Pultsin	594a4bde49	copyright: Geometer Plus => FBReader.ORG Limited, 2014 => 2015	2015-02-28 15:14:56 +01:00
Nikolay Pultsin	1439cc16ee	Merge branch 'master' into lr ... Conflicts: scripts/packageTool.sh	2015-01-16 15:32:04 +00:00
Nikolay Pultsin	fe1fb50394	fixed version detection ... Conflicts: scripts/packageTool.sh	2015-01-16 15:31:18 +00:00
Nikolay Pultsin	00361b0f40	Merge branch 'master' into lr	2015-01-15 19:12:30 +00:00
Nikolay Pultsin	56d500a51c	updated merge process	2015-01-15 19:11:47 +00:00
Nikolay Pultsin	bd4e8157d3	Merge branch 'master' into lr	2015-01-02 18:02:09 +00:00
Nikolay Pultsin	1b8843003d	temporary branches	2015-01-02 18:01:49 +00:00
Nikolay Pultsin	e5819e0f51	Merge branch 'master' into lr	2015-01-02 17:58:49 +00:00
Nikolay Pultsin	7cc57f13ff	do not build sources archive in buildAll.sh	2015-01-02 17:58:28 +00:00
Nikolay Pultsin	dab9fd0f8c	Merge branch 'master' into lr	2014-12-31 04:02:52 +00:00
Nikolay Pultsin	c70c34aa89	intro branches have gone	2014-12-31 04:02:37 +00:00
Nikolay Pultsin	ae32631869	new branches	2014-12-27 07:23:16 +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	15bf3fbd21	updated set_tags script (works with version numbers with spaces)	2014-10-12 23:03:03 +02:00
Nikolay Pultsin	b32eccd4f0	VERSION => 2.2 beta 0	2014-10-12 22:43:10 +02:00
Nikolay Pultsin	237e3b191e	VERSION => 2.2 beta	2014-10-11 17:22:41 +02:00
Nikolay Pultsin	3cdaf8f9fb	+ mkdir -p READY	2014-08-20 00:32:16 +01:00
Nikolay Pultsin	1b08221f91	beta has gone	2014-08-11 16:03:24 +01:00
Nikolay Pultsin	715720931a	no more beta version	2014-08-08 05:19:48 +01: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	6935bb328d	set_tags script	2014-03-19 12:18:27 +02:00
Nikolay Pultsin	1499d036c6	updated script	2014-03-18 03:29:40 +02: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	cf33d3c13b	1.9.5.1	2014-01-31 12:51:14 +00:00
Nikolay Pultsin	f85bfe811d	new targets in buildAll script	2014-01-28 02:10:50 +00:00
Nikolay Pultsin	09a736f59c	updated packageTool	2014-01-28 02:07:27 +00:00
Nikolay Pultsin	740e672a83	plugins & plugins-ics branch have gone	2014-01-12 20:03:16 +00:00