37 Commits

Author	SHA1	Message	Date
deajan	0e2189c441	Added RUN_DIR subset	2018-10-08 21:29:47 +02:00
deajan	bc6ebdb80e	Fixed merge paths and removed unused code	2018-10-02 18:13:48 +02:00
deajan	0d6f7e0ca0	Merge cleanup	2018-10-02 18:11:01 +02:00
deajan	81148db1fa	Fixed merge producing rogue logs	2018-10-02 18:08:03 +02:00
deajan	4f76bb4ad2	Simpler merge process	2018-10-02 10:49:28 +02:00
deajan	13286c2720	[WIP] Merge simplifications	2018-10-02 09:35:48 +02:00
deajan	c694580ae5	Yet another typo fix	2018-10-02 09:22:41 +02:00
deajan	4f3e6a11d2	Fixed typo	2018-10-02 09:17:59 +02:00
deajan	f028f3b6d2	Added preprocessing to batch runner	2018-10-02 09:07:19 +02:00
deajan	2e6e17962c	Removed space	2018-10-01 21:04:41 +02:00
deajan	5bc77dfe76	Add PoorMansRandomGenerator subset	2018-10-01 21:02:47 +02:00
deajan	3532b50c38	Added CleanUp subset	2018-10-01 20:46:55 +02:00
deajan	07775d7390	[WIP] osync-target-helper mode	2018-09-30 21:24:09 +02:00
deajan	844cf56307	Replaced QuickLogger with Logger	2018-06-25 14:11:46 +02:00
deajan	4d9eb8830b	Fixed missing usage	2018-05-28 08:28:01 +02:00
deajan	da381175ed	Addec CheckRFC822 subset	2018-02-20 22:15:20 +01:00
deajan	2038a2ecb9	Made bootstrap and merge program agnostic	2017-06-19 16:01:16 +02:00
deajan	e07cb136c4	Permit merge of other executables	2017-06-18 22:53:57 +02:00
deajan	9f89d4fdff	Added VerComp Subset	2017-04-11 13:26:23 +02:00
deajan	4f8d57498c	Updated installer version logic	2017-03-14 21:12:38 +01:00
deajan	f9077b7ff6	Added new list of subsets	2017-02-07 22:04:19 +01:00
deajan	ea69a58b3d	Fixed program name after fix from other project	2016-12-19 23:40:54 +01:00
deajan	e04e81446e	Fixed typo	2016-12-19 22:38:13 +01:00
deajan	bd28ca8837	Minor changes & fixes	2016-12-11 22:40:27 +01:00
deajan	23cac5cad6	Unexpanded all source files	2016-12-11 20:54:40 +01:00
deajan	76512b5a13	Added _OFUNCTIONS_BOOTSTRAP subset	2016-12-11 14:58:52 +01:00
deajan	b0e589ad78	Re-enabled tmp file deletion after debug	2016-12-08 09:00:58 +01:00
deajan	80cf34cedd	Removed unnecessary code	2016-12-08 08:56:35 +01:00
deajan	731fc81abf	Made ofunctions "includable"	2016-12-07 21:30:10 +01:00
deajan	f8015b735a	Rendered merge BSD compatible	2016-11-20 17:41:52 +01:00
deajan	4c3aa02954	Updated common scripts	2016-09-08 22:49:51 +02:00
deajan	ce38085cac	Made merge output exit codes	2016-08-30 18:20:41 +02:00
deajan	7294fa8846	Updated common merge from other projects	2016-08-28 21:39:09 +02:00
deajan	fb53664877	Added systemd file, installer stats and ssh known host ignore option	2016-03-29 22:55:57 +02:00
deajan	8e74fd2bff	Added optional installer statistics	2016-03-25 23:08:48 +01:00
deajan	9c2df9990f	Merge script should take relative path for ofunctions	2015-11-19 23:07:02 +01:00
deajan	7875469a94	Initial upload of function merge	2015-11-13 20:16:20 +01:00