osync

Author	SHA1	Message	Date
deajan	e4970830ac	Update copyright year	2020-01-10 11:07:25 +01:00
Orsiris de Jong	0c343662f4	Update copyright year	2019-05-22 19:26:32 +02:00
deajan	757c53ca3a	Merge branch 'master' into betterKillChilds Conflicts: dev/debug_osync.sh dev/n_osync.sh osync.sh	2016-04-01 21:24:53 +02:00
deajan	7875469a94	Initial upload of function merge	2015-11-13 20:16:20 +01:00