11 Commits

Author	SHA1	Message	Date
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