diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
tree | 8aca46ab27a54cea34c14001af774942f0502e39 /ext/fileinfo/libmagic/patchlevel.h | |
parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'ext/fileinfo/libmagic/patchlevel.h')
-rw-r--r-- | ext/fileinfo/libmagic/patchlevel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/patchlevel.h b/ext/fileinfo/libmagic/patchlevel.h index a53c6830d8..65551b402e 100644 --- a/ext/fileinfo/libmagic/patchlevel.h +++ b/ext/fileinfo/libmagic/patchlevel.h @@ -351,7 +351,7 @@ * * Revision 1.8 93/02/19 15:01:26 ian * Numerous changes from Guy Harris too numerous to mention but including - * byte-order independance, fixing "old-style masking", etc. etc. A bugfix + * byte-order independence, fixing "old-style masking", etc. etc. A bugfix * for broken symlinks from martin@@d255s004.zfe.siemens.de. * * Revision 1.7 93/01/05 14:57:27 ian |