Commit Graph

3 Commits (9b481467f62d4471e3ba2293ef3973125afbcca2)

Author SHA1 Message Date
Orsiris de Jong 0c343662f4
Update copyright year 5 years ago
deajan 757c53ca3a Merge branch 'master' into betterKillChilds
Conflicts:
	dev/debug_osync.sh
	dev/n_osync.sh
	osync.sh
8 years ago
deajan 7875469a94 Initial upload of function merge 9 years ago