Commit Graph

14 Commits

Author SHA1 Message Date
Ferenc Kovacs
6cf6b58e35 add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details 2015-01-26 11:14:54 +01:00
Ferenc Kovacs
26c5143a7f Merge branch 'PHP-5.6'
* PHP-5.6:
  we also have xz release tarballs since 5.5
  5.5.19 now
2014-10-02 22:33:10 +02:00
Ferenc Kovacs
7a529790b2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  we also have xz release tarballs since 5.5
  5.5.19 now

Conflicts:
	configure.in
	main/php_version.h
2014-10-02 22:32:18 +02:00
Ferenc Kovacs
d7b01aff89 we also have xz release tarballs since 5.5 2014-10-02 22:28:19 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Nuno Lopes
51ce4bd87c add a few more patterns to .gitignore 2014-08-31 15:19:14 +01:00
Bob Weinand
4784d99866 Added autogenerated phpdbg parser files to .gitignore 2014-04-22 00:19:38 +02:00
Will Fitch
c0acb9d5f6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update gitignore and Makefile for additional entries
2014-01-23 21:34:57 -05:00
Will Fitch
c4c10a222e Update gitignore and Makefile for additional entries 2014-01-23 21:28:45 -05:00
Sebastian Bergmann
67a7a66466 Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak 2012-12-16 09:07:55 +01:00
Xinchen Hui
27208de763 Ignore the tempoary files 2012-03-22 17:22:17 +08:00
Xinchen Hui
7aa2b75db2 Ignore the temporay files in sapi/*/tests/ 2012-03-20 17:20:15 +08:00
Sebastian Bergmann
bcd19cf649 Add missing files. 2012-03-19 18:25:37 +01:00
David Soria Parra
887ee455dc Add .gitignore
The gitignore file was created using git svn show-ignore and the overlapping
patterns were removed.
2012-03-19 15:58:34 +01:00