Merge pull request #4825 from computersforpeace/upstart

author Michael R Sweet <michaelrsweet@gmail.com>

Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)

committer GitHub <noreply@github.com>

Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)
author Michael R Sweet <michaelrsweet@gmail.com>
Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)
committer GitHub <noreply@github.com>
Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)
diff --cc config-scripts/cups-startup.m4
Simple merge
diff --cc config.h.in
Simple merge
diff --cc configure
Simple merge
diff --cc scheduler/conf.h
Simple merge
diff --cc scheduler/main.c
Simple merge
diff --cc vcnet/config.h
Simple merge
diff --cc xcode/config.h
Simple merge
author	Michael R Sweet <michaelrsweet@gmail.com>
	Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)
committer	GitHub <noreply@github.com>
	Tue, 21 Jun 2016 15:09:37 +0000 (11:09 -0400)
		1	2
config-scripts/cups-startup.m4	patch \|	diff1 \|	diff2 \|	blob \| history
config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
scheduler/conf.h	patch \|	diff1 \|	diff2 \|	blob \| history
scheduler/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
vcnet/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
xcode/config.h	patch \|	diff1 \|	diff2 \|	blob \| history