[PHP-CVS] com php-src: conflict: ext/gd/gd.c ext/gd/libgd/gd.h ext/gd/libgd/gd_interpolation.c

2013-03-26 Thread Pierre Joye
Commit:23af4ff5bba76bc06066375a93c0babf84ac Author:Pierre Joye pierre@gmail.com Tue, 26 Mar 2013 11:24:00 +0100 Parents: b6fa581d2de04b850129ad669b44865de4aef429 5ae6f582fb9af6e93ecd7001646553ae98be6275 Branches: master Link:

[PHP-CVS] com php-src: fix regression, take #2 (merge issue due to git 1.8 default setting changes): ext/gd/gd.c ext/gd/libgd/gd.h ext/gd/libgd/gd_interpolation.c

2013-03-26 Thread Pierre Joye
Commit:5ae6f582fb9af6e93ecd7001646553ae98be6275 Author:Pierre Joye pierre@gmail.com Tue, 26 Mar 2013 11:23:15 +0100 Parents: c6e911e1549ba23158249ef1c0e6f27dcc6c88bb Branches: PHP-5.5 master Link:

[PHP-CVS] com php-src: merging conflict left over: ext/gd/libgd/gd_interpolation.c

2013-03-26 Thread Pierre Joye
Commit:8a85da4a61c53f012174633ea7cef38cac6cfcbe Author:Pierre Joye pierre@gmail.com Tue, 26 Mar 2013 17:46:29 +0100 Parents: 3b48dc08489a2bde318836cc57c9e2c743bca5cb Branches: master Link:

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c

2013-03-26 Thread Pierre Joye
Commit:705ab202522bda22e0bda2370ac9591fe3c83cb8 Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 05:13:42 +0100 Parents: 8a85da4a61c53f012174633ea7cef38cac6cfcbe f3ebb40ad6041e9c29e165f9d7017fb50063129f Branches: master Link:

[PHP-CVS] com php-src: FALSE on error: ext/gd/gd.c

2013-03-26 Thread Pierre Joye
Commit:f3ebb40ad6041e9c29e165f9d7017fb50063129f Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 05:13:30 +0100 Parents: 4d73bb070ee90336984f275eb24f7d1ca1cff1ea Branches: PHP-5.5 master Link: