diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
|---|---|---|
| committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
| commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
| tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /ext/snmp | |
| parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
| parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
| download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz | |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'ext/snmp')
| -rw-r--r-- | ext/snmp/php_snmp.h | 2 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h index 6e170ffe71..610fff11c7 100644 --- a/ext/snmp/php_snmp.h +++ b/ext/snmp/php_snmp.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index f2eb434b9c..250b1f0ebe 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ |