summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* some more replacementsstr_size_and_int64Anatol Belski2014-08-221-0/+2
* yet more replacesAnatol Belski2014-08-181-0/+2
* more replacements for ngAnatol Belski2014-08-171-0/+6
* Merge remote-tracking branch 'origin/master' into str_size_and_int64Anatol Belski2014-08-045-0/+40
|\
| * Merge branch 'PHP-5.6'Anatol Belski2014-08-040-0/+0
| |\
| * \ Merge branch 'pull-request/756'Anatol Belski2014-08-041-0/+8
| |\ \
| | * | Patches #67739Christian Wenz2014-08-011-0/+8
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-08-044-13/+109
| |\ \ \
| * | | | PHP_INT_MIN and _MAX testsAndrea Faulds2014-08-012-0/+34
| * | | | Merge branch 'PHP_INT_MIN'Andrea Faulds2014-08-013-0/+6
| |\ \ \ \
| | * | | | NEWS and UPGRADINGAndrea Faulds2014-08-012-0/+5
| | * | | | Added PHP_INT_MINAndrea Faulds2014-08-011-0/+1
| |/ / / /
| * | | | Merge branch 'PHP-5.6'Andrey Hristov2014-07-311-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.6'Peter Cowburn2014-07-312-11514/+11512
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'PHP-5.6'Tjerk Meesters2014-07-312-57/+57
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'PHP-5.6'Keyur Govande2014-07-300-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Michael Wallner2014-07-303-6/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '8b9719d'Rasmus Lerdorf2014-07-301-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Bob Weinand2014-07-308-53/+64
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Tjerk Meesters2014-07-302-1/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-07-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-07-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-07-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-07-303-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Dmitry Stogov2014-07-301-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Keyur Govande2014-07-305-26/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Tjerk Meesters2014-07-291-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Keyur Govande2014-07-282-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-284-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-263-23/+178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-261-9/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-07-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Stanislav Malyshev2014-07-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Xinchen Hui2014-07-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Johannes Schlüter2014-07-241-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Johannes Schlüter2014-07-241-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Tjerk Meesters2014-07-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Dmitry Stogov2014-07-242-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Dmitry Stogov2014-07-243-8/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.6'Dmitry Stogov2014-07-232-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str...Anatol Belski2014-08-0444-11720/+12223
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_back...str_size_and_int64_56_backportAnatol Belski2014-08-046-13/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-041-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-041-0/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport the fix for bug #67739Anatol Belski2014-08-041-0/+8
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-041-0/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add testStanislav Malyshev2014-08-041-0/+35
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-044-21/+76
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /