commit 6cb44e2c08892496b5955f8b9afffaa94dfd6112 Merge: 591a626 51c0f67 Author: Elan Ruusamäe <g...@pld-linux.org> Date: Wed Dec 26 19:21:05 2018 +0200
Merge branch 'dev-7.3' Conflicts: bug-52078-fileinode.patch pcre-shared.patch php-link-libs.patch php-pear.patch php.spec spl-shared.patch bug-52078-fileinode.patch | 23 --------- opcache.ini | 3 +- pcre-shared.patch | 126 +++++++++++++++++++++++++--------------------- php-build_modules.patch | 9 ---- php-ini.patch | 52 ++++++++++--------- php-libtool.patch | 10 ++-- php-link-libs.patch | 6 +-- php-pear.patch | 31 ++++++------ php-sapi-ini-file.patch | 2 +- php.spec | 120 ++++++++++++++++++++++--------------------- spl-shared.patch | 6 +-- 11 files changed, 191 insertions(+), 197 deletions(-) --- ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/386818a230959465f75928c7b335dd078cfb75a0 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit