diff options
| author | Anatol Belski <ab@php.net> | 2014-09-26 10:00:10 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-26 10:00:10 +0200 |
| commit | 7d11d66957faf878859e96d46c00121bb942ea57 (patch) | |
| tree | d27fb014e8bef9f229c0f9008eb46833d5b321cd /main/php_output.h | |
| parent | 06d0230a0ffb0f17c6f3ee4590e8f4761e9dff4a (diff) | |
| parent | ed59fa3a0d6ef2ad1a1c99b4b23e9fb82ef02453 (diff) | |
| download | php-git-7d11d66957faf878859e96d46c00121bb942ea57.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
NEWS
NEWS
Fixed bug #68103 Dupplicate entry in Reflection
Fixed optimizer bug
fix C89 compat
fix indentation
fix zts build
Use macro
Optimized (PRE|POST)_(INC|DEC) handlers. Moved proxy object handling into helper function.
Conflicts:
Zend/zend_operators.c
Diffstat (limited to 'main/php_output.h')
0 files changed, 0 insertions, 0 deletions