[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32

2012-10-02 Thread Anatoliy Belsky 
Commit:45351eaab4d8f065c5948de5f28df975b36d592c
Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 09:40:42 +0200
Parents:   60a280936e52b3ab20f0ece06e80088a5bd8fd0c 
0165eec1ea63d4b4a063d68e7b78947f038d67ba
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=45351eaab4d8f065c5948de5f28df975b36d592c

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed include checks for libpng under win

Changed paths:
  MM  ext/gd/config.w32


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32

2012-10-02 Thread Anatoliy Belsky 
Commit:26e492f2f3d3e26f7320957172e37ee49f6e6112
Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 10:00:09 +0200
Parents:   45351eaab4d8f065c5948de5f28df975b36d592c 
92a46fe07e4407d52eb384c48aec5a3538731341
Branches:  PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=26e492f2f3d3e26f7320957172e37ee49f6e6112

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted the previous fix for libpng include

Changed paths:
  MM  ext/gd/config.w32


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php