Merge

asaha · asaha · commit 50c6b22d7a78 · 2017-07-27T11:20:14.000-07:00
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
@@ -3912,7 +3912,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1468207795
+DATE_WHEN_GENERATED=1501170108
 
 ###############################################################################
 #

Original file line number	Diff line number	Diff line change
`@@ -3912,7 +3912,7 @@ fi`
`3912`	`3912`	`#CUSTOM_AUTOCONF_INCLUDE`
`3913`	`3913`
`3914`	`3914`	`# Do not change or remove the following line, it is needed for consistency checks:`
`3915`		`-DATE_WHEN_GENERATED=1468207795`
	`3915`	`+DATE_WHEN_GENERATED=1501170108`
`3916`	`3916`
`3917`	`3917`	`###############################################################################`
`3918`	`3918`	`#`