summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206Bob Weinand2014-02-06119-7575/+7702
|\
| * add T_POW (**) operatordatibbaw2014-02-0620-6746/+7251
| * Merge branch 'PHP-5.6'Anatol Belski2014-02-056-3/+650
| |\
| * | fix tests for ICU >= 52.1Anatol Belski2014-02-0516-10/+462
| * | Merge branch 'PHP-5.6'Hannes Magnusson2014-02-050-0/+0
| |\ \
| * \ \ Merge branch 'PHP-5.6'Anatol Belski2014-02-051-3/+1
| |\ \ \
| * \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-02-050-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-02-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-02-040-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-02-043-4/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-02-04104-5746/+22111
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-02-030-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-0/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-3/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'krakjoe2014-02-021-34/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://git.php.net/repository/php-srckrakjoe2014-02-02158-1274/+4323
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-02-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Remove #if PHP_VERSION_ID version checksDaniel Lowrey2014-02-011-20/+0
| | * | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.6'Daniel Lowrey2014-01-311-4/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | fix ZTS buildAnatol Belski2014-01-301-1/+1
| | * | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | tests still failing, so xfail for now until fixedStanislav Malyshev2014-01-292-2/+4
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.6'Yasuo Ohgaki2014-01-301-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-01-291-15/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | fix merge error after b4b4d9697fa43a526466165a3ca89d058296cb04Anatol Belski2014-01-291-12/+0
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git.php.net:php-srcAndrey Hristov2014-01-291-11/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Remi Collet2014-01-292-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Remi Collet2014-01-291-44/+62
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Yasuo Ohgaki2014-01-295-14/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Daniel Lowrey2014-01-289-56/+193
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/php/php-srcDaniel Lowrey2014-01-282-1/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Andrey Hristov2014-01-2925-117/+402
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git.php.net:php-srcAndrey Hristov2014-01-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.6'Bob Weinand2014-01-281-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Anatol Belski2014-01-282-8/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '5.6'Daniel Lowrey2014-01-271-7/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Andrey Hristov2014-01-283-15/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Andrey Hristov2014-01-283-3/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.6'Yasuo Ohgaki2014-01-272-70/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-263-9/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-261-17/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-267-0/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-261-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-01-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \