Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

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
pull/631/merge
Ferenc Kovacs 12 years ago
parent
26f4e40622 d7b01aff89
commit
7a529790b2
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore

1
.gitignore
View File

@ -19,6 +19,7 @@
*.tgz
*.tar.gz
*.tar.bz2
*.tar.xz
.FBCIndex
.FBCLockFolder
.deps

Write Preview
Loading…
Cancel
Save