]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorFelipe Pena <felipensp@gmail.com>
Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 21 Aug 2012 23:15:48 +0000 (20:15 -0300)
* PHP-5.3:
  - Removed PHP 6 checks

1  2 
ext/phar/phar.c
ext/phar/phar_object.c
ext/phar/stream.c

diff --cc ext/phar/phar.c
Simple merge
Simple merge
Simple merge