Merge branch '2.91' of git.sv.gnu.org:/srv/git/sysvinit into 2.91

This commit is contained in:
Jesse Smith 2018-06-22 17:05:35 -03:00
commit 8cc9f34ca4

View File

@ -4,9 +4,13 @@ sysvinit (2.91) UNRELEASED; urgency=low
* Adjusted order of compile flags to make it easier for downstream
to adjust optimization level. Patch provided by Matias Fonzo.
<<<<<<< HEAD
Can now set optimization level in CFLAGS variable.
* Added --version command line flag to display current version info.
Updated manual page for init.8 to match.
=======
Can now set optimization level in CFLAGS varible.
>>>>>>> 5f6d86d216fd25a5086750465e73ed5579a86d18
sysvinit (2.90) world; urgency=low