From: Michael Wallner <mike@php.net>
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/?a=commitdiff_plain;h=8b4959e8cd9953a923b0825a6aeba75addc389a9;p=m6w6%2Fext-raphf

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
    <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>