]> granicus.if.org Git - php/log
php
11 years agoconflict
Pierre Joye [Mon, 25 Mar 2013 11:20:01 +0000 (12:20 +0100)]
conflict

11 years agoadd new functions and constants for GD
Pierre Joye [Mon, 25 Mar 2013 11:15:46 +0000 (12:15 +0100)]
add new functions and constants for GD

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Mon, 25 Mar 2013 02:19:08 +0000 (03:19 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Mon, 25 Mar 2013 02:17:59 +0000 (03:17 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Mon, 25 Mar 2013 02:14:40 +0000 (03:14 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  remove comments

11 years agoremove comments
Pierre Joye [Mon, 25 Mar 2013 02:14:27 +0000 (03:14 +0100)]
remove comments

11 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Mon, 25 Mar 2013 02:07:43 +0000 (19:07 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agofix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
Stanislav Malyshev [Mon, 25 Mar 2013 02:03:04 +0000 (19:03 -0700)]
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agofix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
Stanislav Malyshev [Mon, 25 Mar 2013 02:03:04 +0000 (19:03 -0700)]
fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 24 Mar 2013 16:55:01 +0000 (17:55 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix PDO::inTransaction() test for pgsql
Nikita Popov [Sun, 24 Mar 2013 16:52:16 +0000 (17:52 +0100)]
Fix PDO::inTransaction() test for pgsql

inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.

11 years agoMerge branch 'PHP-5.5'
Johannes Schlüter [Sun, 24 Mar 2013 16:33:41 +0000 (17:33 +0100)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sun, 24 Mar 2013 16:33:17 +0000 (17:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoDocument embedded server options in manpage
Johannes Schlüter [Sun, 24 Mar 2013 16:32:30 +0000 (17:32 +0100)]
Document embedded server options in manpage

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Sun, 24 Mar 2013 16:32:00 +0000 (17:32 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoIt's 2013, even for a manpage
Johannes Schlüter [Sun, 24 Mar 2013 16:31:29 +0000 (17:31 +0100)]
It's 2013, even for a manpage

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 24 Mar 2013 16:07:36 +0000 (17:07 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix mysql_list_fields.phpt test
Nikita Popov [Sun, 24 Mar 2013 16:06:03 +0000 (17:06 +0100)]
Fix mysql_list_fields.phpt test

The minimum length is given in bytes, so it is charset dependent.
For utf8 charsets for example it's 3 rather than 1.

11 years agofix conflict
Pierre Joye [Sun, 24 Mar 2013 15:54:55 +0000 (16:54 +0100)]
fix conflict

11 years agofix generic rotation and 90 degrees & multiples rotation, take #2
Pierre Joye [Sun, 24 Mar 2013 15:52:20 +0000 (16:52 +0100)]
fix generic rotation and 90 degrees & multiples rotation, take #2

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 24 Mar 2013 15:09:59 +0000 (16:09 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix some errors in mysqlnd charset list
Nikita Popov [Sun, 24 Mar 2013 15:04:45 +0000 (16:04 +0100)]
Fix some errors in mysqlnd charset list

I fixed the stuff that seemed obviously wrong, but there are some more
differences with the SHOW COLLATIONS output:

 * The whole range of "utf16" collations missing
 * "filename" missing
 * "ucs2_general_mysql500_ci" and "utf8_general_mysql500_ci" missing

I wasn't sure whether those omissions are intentional, so I didn't add
them.

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Sun, 24 Mar 2013 13:06:25 +0000 (14:06 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:

11 years agoMerge commit '1ec484d' into PHP-5.5
David Soria Parra [Sun, 24 Mar 2013 13:05:55 +0000 (14:05 +0100)]
Merge commit '1ec484d' into PHP-5.5

* commit '1ec484d':
  - add imageaffinematrixget and imagematrixconcat
  - add affine matrix helper for translate, scale, rotate and shear
  - fix unix build
  - add new files for interpolation
  - config.m4 sync with .w32
  - add new interpolation method   . imagescale   . imageaffine   . replace imagerotate with new generic and optimized new implementations   . imagesetinterpolationmethod, to set the default interpolation to be     used with the new functions   . add imagepalettetotruecolor

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 24 Mar 2013 12:58:44 +0000 (13:58 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix version check in test
Nikita Popov [Sun, 24 Mar 2013 11:52:56 +0000 (12:52 +0100)]
Fix version check in test

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Sun, 24 Mar 2013 12:29:30 +0000 (13:29 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - add reminder for checking return values

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Sun, 24 Mar 2013 12:29:16 +0000 (13:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - add reminder for checking return values

11 years ago- add reminder for checking return values
Pierre Joye [Sun, 24 Mar 2013 12:27:00 +0000 (13:27 +0100)]
- add reminder for checking return values

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sat, 23 Mar 2013 21:44:10 +0000 (22:44 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sat, 23 Mar 2013 21:43:58 +0000 (22:43 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

11 years ago- fix x64 issues on windows with the various time types (overflow, signed and unsigne...
Pierre Joye [Sat, 23 Mar 2013 09:18:31 +0000 (10:18 +0100)]
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

Signed-off-by: Anatol Belski <ab@php.net>
11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sat, 23 Mar 2013 20:45:24 +0000 (21:45 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix cli server tests on travis
Nikita Popov [Sat, 23 Mar 2013 20:43:55 +0000 (21:43 +0100)]
Fix cli server tests on travis

This passes an absolute path to the executable, rather than a relative.
Maybe this is something that should be done automatically by
run-tests.php as it doesn't apply only to travis.

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sat, 23 Mar 2013 20:09:37 +0000 (21:09 +0100)]
Merge branch 'PHP-5.5'

11 years agoSkip locale dependent test if locale not available
Nikita Popov [Sat, 23 Mar 2013 20:05:29 +0000 (21:05 +0100)]
Skip locale dependent test if locale not available

11 years agoMissed two occurances of Revision:
Nikita Popov [Sat, 23 Mar 2013 20:02:14 +0000 (21:02 +0100)]
Missed two occurances of Revision:

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sat, 23 Mar 2013 20:01:05 +0000 (21:01 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reworked the changes for bug #64452

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sat, 23 Mar 2013 20:00:46 +0000 (21:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Reworked the changes for bug #64452

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Sat, 23 Mar 2013 19:59:47 +0000 (20:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Reworked the changes for bug #64452

11 years agoReworked the changes for bug #64452
Anatol Belski [Sat, 23 Mar 2013 19:57:59 +0000 (20:57 +0100)]
Reworked the changes for bug #64452

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sat, 23 Mar 2013 19:14:13 +0000 (20:14 +0100)]
Merge branch 'PHP-5.5'

11 years agophar phpinfo uses Id instead of Revision
Nikita Popov [Sat, 23 Mar 2013 19:11:06 +0000 (20:11 +0100)]
phar phpinfo uses Id instead of Revision

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sat, 23 Mar 2013 17:26:45 +0000 (18:26 +0100)]
Merge branch 'PHP-5.5'

11 years agoUse NEWS merge driver for UPGRADING and UPGRADING.INTERNALS
Nikita Popov [Sat, 23 Mar 2013 17:26:11 +0000 (18:26 +0100)]
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS

11 years agoShow diffs on Travis CI
Nikita Popov [Sat, 23 Mar 2013 17:25:18 +0000 (18:25 +0100)]
Show diffs on Travis CI

11 years agoMerge branch 'PHP-5.5'
Nikita Popov [Sat, 23 Mar 2013 17:09:05 +0000 (18:09 +0100)]
Merge branch 'PHP-5.5'

Conflicts:
UPGRADING
UPGRADING.INTERNALS

11 years agoMove some internal changes from UPGRADING to UPGRADING.INTERNALS
Nikita Popov [Sat, 23 Mar 2013 17:06:25 +0000 (18:06 +0100)]
Move some internal changes from UPGRADING to UPGRADING.INTERNALS

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Sat, 23 Mar 2013 16:48:21 +0000 (17:48 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed possible precision loss in microtime

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Sat, 23 Mar 2013 16:48:05 +0000 (17:48 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed possible precision loss in microtime

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatol Belski [Sat, 23 Mar 2013 16:47:39 +0000 (17:47 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed possible precision loss in microtime

11 years agoFixed possible precision loss in microtime
Anatol Belski [Sat, 23 Mar 2013 16:40:06 +0000 (17:40 +0100)]
Fixed possible precision loss in microtime

This is related to the fix for bug #64370. MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.

11 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Sat, 23 Mar 2013 09:30:06 +0000 (10:30 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Sat, 23 Mar 2013 09:26:26 +0000 (10:26 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierre Joye [Sat, 23 Mar 2013 09:21:22 +0000 (10:21 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

11 years ago- fix x64 issues on windows with the various time types (overflow, signed and unsigne...
Pierre Joye [Sat, 23 Mar 2013 09:18:31 +0000 (10:18 +0100)]
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Fri, 22 Mar 2013 16:45:07 +0000 (17:45 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Note about bison version
  Add SplDoublyLinkedList::add to UPGRADING
  Tweaks an add OPcache info to UPGRADING

Conflicts:
UPGRADING

11 years agoNote about bison version
David Soria Parra [Fri, 22 Mar 2013 16:44:32 +0000 (17:44 +0100)]
Note about bison version

11 years agoAdd SplDoublyLinkedList::add to UPGRADING
Etienne Kneuss [Fri, 22 Mar 2013 10:35:45 +0000 (11:35 +0100)]
Add SplDoublyLinkedList::add to UPGRADING

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Fri, 22 Mar 2013 08:30:32 +0000 (09:30 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt), fix for all cases

11 years ago- fix regression (imagerotate_overflow.phpt), fix for all cases
Pierre Joye [Fri, 22 Mar 2013 08:30:23 +0000 (09:30 +0100)]
- fix regression (imagerotate_overflow.phpt), fix for all cases

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Fri, 22 Mar 2013 08:21:23 +0000 (09:21 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt

11 years ago- fix regression bug24155.phpt and bug39366.phpt
Pierre Joye [Fri, 22 Mar 2013 08:21:11 +0000 (09:21 +0100)]
- fix regression bug24155.phpt and bug39366.phpt

11 years agoMerge branch 'master' of git.php.net:php-src
Pierre Joye [Fri, 22 Mar 2013 07:31:11 +0000 (08:31 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Fri, 22 Mar 2013 07:28:25 +0000 (08:28 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt)

11 years ago- fix regression (imagerotate_overflow.phpt)
Pierre Joye [Fri, 22 Mar 2013 07:28:11 +0000 (08:28 +0100)]
- fix regression (imagerotate_overflow.phpt)

11 years agoTweaks an add OPcache info to UPGRADING
Rasmus Lerdorf [Fri, 22 Mar 2013 06:14:16 +0000 (23:14 -0700)]
Tweaks an add OPcache info to UPGRADING

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add OPCache ini settings to php.ini

11 years agoAdd OPCache ini settings to php.ini
David Soria Parra [Thu, 21 Mar 2013 14:50:21 +0000 (15:50 +0100)]
Add OPCache ini settings to php.ini

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Thu, 21 Mar 2013 13:32:57 +0000 (21:32 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 13:32:32 +0000 (21:32 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix bug in reflectionClass relate to #64239
Xinchen Hui [Thu, 21 Mar 2013 13:29:02 +0000 (21:29 +0800)]
Fix bug in reflectionClass relate to #64239

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Thu, 21 Mar 2013 13:11:42 +0000 (21:11 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
Xinchen Hui [Thu, 21 Mar 2013 13:11:15 +0000 (21:11 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 13:10:32 +0000 (21:10 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
Xinchen Hui [Thu, 21 Mar 2013 13:09:30 +0000 (21:09 +0800)]
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Thu, 21 Mar 2013 07:58:25 +0000 (15:58 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 07:58:08 +0000 (15:58 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7
Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]
Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7

11 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Thu, 21 Mar 2013 03:15:05 +0000 (11:15 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 21 Mar 2013 03:14:36 +0000 (11:14 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64432 (more empty delimiter warning in strX methods)
Xinchen Hui [Thu, 21 Mar 2013 03:14:10 +0000 (11:14 +0800)]
Fixed bug #64432 (more empty delimiter warning in strX methods)

11 years agofix memory leak
Xinchen Hui [Thu, 21 Mar 2013 02:56:30 +0000 (10:56 +0800)]
fix memory leak

the value shouldn't be ref, use z_add_ref is enough

11 years agofix memory leak
Xinchen Hui [Thu, 21 Mar 2013 02:56:30 +0000 (10:56 +0800)]
fix memory leak

the value shouldn't be ref, use z_add_ref is enough

11 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 20 Mar 2013 21:16:08 +0000 (14:16 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add array_column()

11 years agoadd array_column()
Stanislav Malyshev [Wed, 20 Mar 2013 21:14:17 +0000 (14:14 -0700)]
add array_column()

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 20 Mar 2013 14:24:00 +0000 (15:24 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS section for beta 2
  NEWS for beta 1
  Allow local override of PHPROOT in makedist

11 years agoNEWS section for beta 2
David Soria Parra [Wed, 20 Mar 2013 14:07:08 +0000 (15:07 +0100)]
NEWS section for beta 2

11 years agoNEWS for beta 1
David Soria Parra [Wed, 20 Mar 2013 14:06:15 +0000 (15:06 +0100)]
NEWS for beta 1

11 years agoAllow local override of PHPROOT in makedist
David Soria Parra [Wed, 20 Mar 2013 14:16:24 +0000 (15:16 +0100)]
Allow local override of PHPROOT in makedist

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 20 Mar 2013 12:14:33 +0000 (13:14 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for array_column
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()

11 years agoNEWS for array_column
David Soria Parra [Wed, 20 Mar 2013 12:14:20 +0000 (13:14 +0100)]
NEWS for array_column

11 years agoMerge branch 'pull-request/257' into PHP-5.5
David Soria Parra [Wed, 20 Mar 2013 12:02:33 +0000 (13:02 +0100)]
Merge branch 'pull-request/257' into PHP-5.5

* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Wed, 20 Mar 2013 11:38:22 +0000 (12:38 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - ws

Conflicts:
UPGRADING

11 years ago- ws
Pierre Joye [Wed, 20 Mar 2013 11:37:13 +0000 (12:37 +0100)]
- ws

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Wed, 20 Mar 2013 11:34:51 +0000 (12:34 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - add gd changes

Conflicts:
UPGRADING

11 years ago- add gd changes
Pierre Joye [Wed, 20 Mar 2013 11:34:01 +0000 (12:34 +0100)]
- add gd changes

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Wed, 20 Mar 2013 11:29:56 +0000 (12:29 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - update the comment to match the code/features

11 years ago- update the comment to match the code/features
Pierre Joye [Wed, 20 Mar 2013 11:29:47 +0000 (12:29 +0100)]
- update the comment to match the code/features