Merge branch 'finit-sm' of https://github.com/westermo/finit into westermo-finit-sm

Hand merged conflicts in the following files:
	Makefile
	finit.h
	service.c

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2016-06-04 19:48:08 +02:00
commit cc15d3f77b
9 files changed
+307 -152

No files matched your search

+2
View File
@@ -37,6 +37,8 @@ void service_reload_dynamic (void);
void service_step(svc_t *svc);
void service_step_all(int types);
int service_stop_is_done(void);
#endif /* FINIT_SERVICE_H_ */
/**