12 Commits

Author	SHA1	Message	Date
deajan	7967251206	Added merge and bootstrap from osync	2016-12-20 21:19:31 +01:00
deajan	92852357e3	Updated merge for BSD / Mac compat	2016-11-30 13:28:26 +01:00
deajan	179434e9b0	Updated common scripts	2016-09-08 22:51:00 +02:00
deajan	9da86de41e	Fixed merge program variable	2016-08-30 18:56:18 +02:00
deajan	0cab87309f	Improved merge.sh with exit codes.	2016-08-30 18:28:27 +02:00
deajan	b66f25f436	Updated merge tool	2016-08-06 16:14:07 +02:00
deajan	4b888812ff	Revert "Updated merge tool" ... This reverts commit 0aee59e05e.	2016-08-06 16:13:11 +02:00
deajan	0aee59e05e	Updated merge tool	2016-08-06 16:12:31 +02:00
deajan	d860242781	Made merge.sh work with all programs	2016-08-06 15:15:11 +02:00
deajan	a7e8487df3	Added optional statistics for installer	2016-03-25 22:51:26 +01:00
deajan	61a70b1ba5	Fixed ofunctions.sh path	2015-11-19 23:05:59 +01:00
deajan	197f3036d1	Initial v2.0 upload	2015-11-12 01:26:38 +01:00