diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-10 19:41:33 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-10 19:45:18 +0100 |
| commit | 112a476b683a634390b23fe7509d5b73632d0829 (patch) | |
| tree | 9842725cd333a02c00172b5bf6811f19dc7b5bbb /ext/json/php_json.h | |
| parent | 9ada49fa1c957645e2bd4a7d58f2fb49a8f834e7 (diff) | |
| parent | 1c8fccdf6d6d04d8e6a5dedd7c9d6b1afda8839f (diff) | |
| download | php-git-112a476b683a634390b23fe7509d5b73632d0829.tar.gz | |
Merge .gitattributes EOL commit from 5.3.
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions