Commit Graph

4 Commits (5cc42d360a7bcb6c449ee2800b576c137d85977a)

Author SHA1 Message Date
deajan 757c53ca3a Merge branch 'master' into betterKillChilds
Conflicts:
	dev/debug_osync.sh
	dev/n_osync.sh
	osync.sh
8 years ago
deajan 5147431abf Merge branch 'master' of https://github.com/jodysankey/osync into jodysankey-master
Conflicts:
	sync.conf
9 years ago
deajan 17c8bab444 Updated shunit2 to 2.1.7pre 9 years ago
onovy 13c9b02add Unit tests. 9 years ago