Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 08:59:33 +0000 (10:59 +0200)
committerMichael Wallner <mike@php.net>
Tue, 1 Sep 2015 08:59:33 +0000 (10:59 +0200)
Conflicts:
php_raphf.h

1  2 
package.xml
php_raphf.h

diff --cc package.xml
index f64b6250cef711613aa10b06b3ebeca0f73ec23a,492d8d086b891b0637f0c56c7ed282c553a94bd2..d8e6e2db45d108f404f99488acc38da2eae0a9a4
@@@ -19,10 -19,10 +19,10 @@@ http://pear.php.net/dtd/package-2.0.xsd
    <email>mike@php.net</email>
    <active>yes</active>
   </lead>
-  <date>2015-07-21</date>
+  <date>2015-07-28</date>
   <version>
--  <release>1.1.0</release>
--  <api>1.0.0</api>
++  <release>2.0.0-dev</release>
++  <api>2.0.0</api>
   </version>
   <stability>
    <release>stable</release>
@@@ -30,8 -30,8 +30,6 @@@
   </stability>
   <license>BSD, revised</license>
   <notes><![CDATA[
--* Fixed php module dependency check with RTLD_LAZY
--+ Source code documentation available at http://m6w6.github.io/ext-raphf
  ]]></notes>
   <contents>
    <dir name="/">
@@@ -53,7 -54,9 +52,7 @@@
   <dependencies>
    <required>
     <php>
-     <min>5.3</min>
 -    <min>5.3.0</min>
 -    <max>7.0.0</max>
 -    <exclude>7.0.0</exclude>
++    <min>7.0.0</min>
     </php>
     <pearinstaller>
      <min>1.4.0</min>
diff --cc php_raphf.h
Simple merge