diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-13 21:46:52 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-13 21:48:05 +0200 |
| commit | 57c998361957fec8a58b4ea6a9bc49887395db93 (patch) | |
| tree | 22247eb18647a12ec425cd1b5e3de13f08e0b36c /main/php_variables.c | |
| parent | 7ed028b1080c44a8de4da1d775fd8e38c6536845 (diff) | |
| parent | eb190b4e917e537380a505c4c28b9dc2c5b3c295 (diff) | |
| download | php-git-57c998361957fec8a58b4ea6a9bc49887395db93.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/reflection/php_reflection.c
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions