Pierre Joye
e9a2642c89
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-03-04 14:06:09 +01:00
Pierre Joye
5001f40e82
- add noisy php logo for autocrop with threshold test
2013-03-04 12:05:59 +01:00
Anatol Belski
2635408a0d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:15:17 +01:00
Anatol Belski
4e46a87392
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf
Fixed PCRE locale crash in Windows/TS
2013-03-04 09:09:45 +01:00
Pierre Joye
2024ff3b61
- add test for imagecropauto
2013-03-04 07:26:07 +01:00
Stanislav Malyshev
b65d4d1cfc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
rename NEWS back
updated NEWS
2013-03-03 13:24:00 -08:00
Stanislav Malyshev
2578f7bcc0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
rename NEWS back
updated NEWS
2013-03-03 13:20:57 -08:00
Stanislav Malyshev
656fcb67f1
rename NEWS back
2013-03-03 13:18:58 -08:00
Anatol Belski
a5b6a0a25b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:23:06 +01:00
Anatol Belski
d95faef1a1
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:22:35 +01:00
Anatol Belski
fe2612d71e
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
...
* 'PHP-5.3' of git.php.net:php-src:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:21:45 +01:00
Anatol Belski
555d584a40
updated NEWS
2013-03-03 19:16:36 +01:00
Anatol Belski
b89c326578
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:15:37 +01:00
Anatol Belski
00ecc12c0f
updated NEWS
2013-03-03 19:14:50 +01:00
Anatol Belski
faf14e9b2e
Merge commit 'NEWS' into PHP-5.4
...
* commit 'NEWS':
This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:14:17 +01:00
Anatol Belski
e1023affc1
updated NEWS
2013-03-03 19:13:38 +01:00
Derick Rethans
1e1de1554f
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:10:24 -05:00
Anatol Belski
1cda84a986
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
merged PCRE 8.32
2013-03-03 19:10:12 +01:00
Derick Rethans
47ac3ec1f4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-03 13:10:07 -05:00
Derick Rethans
6c2564766f
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:09:52 -05:00
Derick Rethans
206cce0d8b
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 13:09:31 -05:00
Derick Rethans
b36df28dca
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 13:08:19 -05:00
Anatol Belski
ca4a3e6138
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
merged PCRE 8.32
2013-03-03 19:07:49 +01:00
Anatol Belski
357ab3cbad
merged PCRE 8.32
...
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
2013-03-03 19:06:22 +01:00
Derick Rethans
c596850af6
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-03 12:58:42 -05:00
Derick Rethans
a3f020a4be
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5
- Updated to version 2013.1 (2013a)
2013-03-03 12:53:22 -05:00
Pierre Joye
0a55c4b1dd
- (s)rgb distance works way better for now, re enable threshold
2013-03-03 05:30:12 +01:00
Xinchen Hui
46e612ada4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-03 11:25:29 +08:00
Xinchen Hui
fe5ce5cb91
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-03 11:25:08 +08:00
Xinchen Hui
9bda6a25a5
Fix test (skip on unable to create socket)
2013-03-03 11:24:45 +08:00
Xinchen Hui
2413fa6fbb
Fix test after the convert_to_long be improved, see #64290
2013-03-03 11:13:52 +08:00
Xinchen Hui
505c6ca486
Fixed bug #64290 (behavior change of converting to long)
...
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
2013-03-03 10:59:15 +08:00
Xinchen Hui
f2246f352f
Fixed Bug #64340 (sockets tests failed) Patch by Reeze
...
Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
2013-03-03 10:51:04 +08:00
Dmitry Stogov
ecf0cbdf3b
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:25 +04:00
Dmitry Stogov
b6656d0ec9
Fixed timestamp update on Phar contents modification.
2013-03-01 19:17:08 +04:00
Pierre Joye
7698bc5735
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 08:10:49 +01:00
Stanislav Malyshev
99b373da25
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.24-dev
5.3.23RC1
2013-02-28 21:30:02 -08:00
Stanislav Malyshev
03dfa08da9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.4.24-dev
5.3.23RC1
Conflicts:
configure.in
main/php_version.h
2013-02-28 21:29:40 -08:00
Stanislav Malyshev
5c5bc7cf1b
5.4.24-dev
2013-02-28 21:25:36 -08:00
Stanislav Malyshev
8f533d2dfd
5.3.23RC1
2013-02-28 21:22:06 -08:00
Pierre Joye
22aeb976e0
- add todo for threshold
2013-02-28 19:34:14 +01:00
Pierre Joye
0c32a18d4c
- clean and enable threshold
2013-02-28 19:22:06 +01:00
Pierre Joye
a991360344
- add image crop support
2013-02-28 17:24:23 +01:00
Pierre Joye
82765a0780
- typo
2013-02-27 21:02:47 +01:00
Pierre Joye
74983a45cc
- fix name for imageflip constants, consistent witht the other
2013-02-27 20:23:31 +01:00
Pierre Joye
03d0bf633d
- add test
2013-02-27 20:22:45 +01:00
Pierre Joye
34adce6c47
- add constants for imageflip
2013-02-27 20:08:26 +01:00
Pierre Joye
efffdb4d7f
- add only once
2013-02-27 16:03:17 +01:00
