delta/php-git.git/Makefile.global, branch php-5.6.7 git.php.net: repository/php-src.git Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10T07:55:05+00:00 Xinchen Hui laruence@php.net 2014-03-10T07:55:05+00:00 aa23d754a9aceb1312a847d588a152e224e08c5b 






Do not remove *.1, it's not generated by make but configure
2014-03-10T07:54:20+00:00

Xinchen Hui
laruence@php.net

2014-03-10T07:54:20+00:00

a930e047927835db02325e0e7a0ae48da00649e0












Merge branch 'PHP-5.5' into PHP-5.6
2014-01-24T02:35:24+00:00

Will Fitch
willf@aweber.com

2014-01-24T02:35:24+00:00

a9b40a20fcd6c3c06c62908bc1e7b8a645ecd3c2

* PHP-5.5:
  Update gitignore and Makefile for additional entries





* PHP-5.5:
  Update gitignore and Makefile for additional entries







Merge branch 'PHP-5.4' into PHP-5.5
2014-01-24T02:34:57+00:00

Will Fitch
willf@aweber.com

2014-01-24T02:34:57+00:00

c0acb9d5f6fc5b8cd1b389877deb2f9452b6ee0b

* PHP-5.4:
  Update gitignore and Makefile for additional entries





* PHP-5.4:
  Update gitignore and Makefile for additional entries







Update gitignore and Makefile for additional entries
2014-01-24T02:28:45+00:00

Will Fitch
willf@aweber.com

2014-01-24T02:28:45+00:00

c4c10a222e4358b1d9d28ef852e8a5d56709865d












Merge branch 'PHP-5.4' into PHP-5.5
2013-08-07T20:14:46+00:00

Christopher Jones
sixd@php.net

2013-08-07T20:14:46+00:00

ae4f8b2ab091cf96058e20ebfab387e21cd26b4c

* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.





* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.







Remove tabs on blanklines in Makefile sources. This prevents a
2013-08-07T20:14:00+00:00

Christopher Jones
sixd@php.net

2013-07-30T20:36:10+00:00

4ed133c4e216b62778fc9c2c53b27be5f454850f

'suspicious line' warning when editing & saving Makefile using Emacs.





'suspicious line' warning when editing & saving Makefile using Emacs.







unify stdint type usage
2013-08-06T20:49:56+00:00

Michael Wallner
mike@php.net

2013-08-06T20:45:35+00:00

14caf174ff219376e4f1234bd297ffe973cc416e

if you need C99 stdint types, just include "php_stdint.h"





if you need C99 stdint types, just include "php_stdint.h"







Fixed bug #62691 (solaris sed has no -i switch)
2013-08-05T22:18:12+00:00

Christopher Jones
sixd@php.net

2013-07-31T16:58:28+00:00

3bbe5931bc2b05ff8bcdf217bc6e79f5ac4cd692

Make 'make distclean' remove generated DTrace .h file





Make 'make distclean' remove generated DTrace .h file







Merge branch 'PHP-5.5'
2013-08-01T16:22:47+00:00

Christopher Jones
sixd@php.net

2013-08-01T16:22:47+00:00

9cd1ac7b61a473232d867c3eb69bfb8525f0d951

* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.





* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.