Commit Graph

7 Commits

Author SHA1 Message Date
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