Merge remote-tracking branch 'origin/5_6_yosemite' into 7_0_yosemite

7.0.22 * origin/5_6_yosemite: 5.6.31 update icu to 58.1 # Conflicts: # build-php.pl
liip · Aug 17, 2017 · 364ef32 · 364ef32
2 parents 3105bc0 + 08642e6
commit 364ef32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build-php.pl b/build-php.pl
@@ -60,7 +60,7 @@
 			suffix       => '-apache2',
 		},
 	},
-	version              => '7.0.18',
+	version              => '7.0.22',
 	release              => 1,
 	debug                => 0,
 );

diff --git a/lib/Package/icu.pm b/lib/Package/icu.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use base qw(Package);
 
-our $VERSION = '56.1';
+our $VERSION = '58.1';
 
 sub base_url {
 	return "http://download.icu-project.org/files/icu4c/" . $VERSION;