From: Michael Wallner Date: Tue, 1 Sep 2015 08:59:33 +0000 (+0200) Subject: Merge branch 'master' into phpng X-Git-Tag: release-2.0.0RC1~14 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-raphf;a=commitdiff_plain;h=8b4959e8cd9953a923b0825a6aeba75addc389a9 Merge branch 'master' into phpng Conflicts: php_raphf.h --- 8b4959e8cd9953a923b0825a6aeba75addc389a9 diff --cc package.xml index f64b625,492d8d0..d8e6e2d --- a/package.xml +++ b/package.xml @@@ -19,10 -19,10 +19,10 @@@ http://pear.php.net/dtd/package-2.0.xsd mike@php.net yes - 2015-07-21 + 2015-07-28 -- 1.1.0 -- 1.0.0 ++ 2.0.0-dev ++ 2.0.0 stable @@@ -30,8 -30,8 +30,6 @@@ BSD, revised @@@ -53,7 -54,9 +52,7 @@@ - 5.3 - 5.3.0 - 7.0.0 - 7.0.0 ++ 7.0.0 1.4.0