diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-30 10:31:10 +0200 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-07-30 10:31:10 +0200 |
| commit | dec7bad63504e828f2111265d1bb6624951c0548 (patch) | |
| tree | 343caeece98205189bdb1b2426c2663bf70ad633 /ext/intl/tests/_files | |
| parent | e0c014deadc4d858507b83fab49e95b7f06954dc (diff) | |
| parent | 7e3e1837c8e60ad87e9b7aee6cb306a843f5c784 (diff) | |
| download | php-git-dec7bad63504e828f2111265d1bb6624951c0548.tar.gz | |
Merge branch '5.3' into 5.4
* 5.3:
Limit test to ICU 49
Remove executable bit from files
Diffstat (limited to 'ext/intl/tests/_files')
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/es-bundle.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/res_index.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/resourcebundle.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/resourcebundle/es.res | bin | 384 -> 384 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/resourcebundle/res_index.res | bin | 128 -> 128 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | ext/intl/tests/_files/resourcebundle/root.res | bin | 388 -> 388 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/ext/intl/tests/_files/es-bundle.txt b/ext/intl/tests/_files/es-bundle.txt index 46399a7717..46399a7717 100755..100644 --- a/ext/intl/tests/_files/es-bundle.txt +++ b/ext/intl/tests/_files/es-bundle.txt diff --git a/ext/intl/tests/_files/res_index.txt b/ext/intl/tests/_files/res_index.txt index a39bea58e5..a39bea58e5 100755..100644 --- a/ext/intl/tests/_files/res_index.txt +++ b/ext/intl/tests/_files/res_index.txt diff --git a/ext/intl/tests/_files/resourcebundle.txt b/ext/intl/tests/_files/resourcebundle.txt index 5b081da6cc..5b081da6cc 100755..100644 --- a/ext/intl/tests/_files/resourcebundle.txt +++ b/ext/intl/tests/_files/resourcebundle.txt diff --git a/ext/intl/tests/_files/resourcebundle/es.res b/ext/intl/tests/_files/resourcebundle/es.res Binary files differindex f9d891d6ba..f9d891d6ba 100755..100644 --- a/ext/intl/tests/_files/resourcebundle/es.res +++ b/ext/intl/tests/_files/resourcebundle/es.res diff --git a/ext/intl/tests/_files/resourcebundle/res_index.res b/ext/intl/tests/_files/resourcebundle/res_index.res Binary files differindex 9dd3df2de3..9dd3df2de3 100755..100644 --- a/ext/intl/tests/_files/resourcebundle/res_index.res +++ b/ext/intl/tests/_files/resourcebundle/res_index.res diff --git a/ext/intl/tests/_files/resourcebundle/root.res b/ext/intl/tests/_files/resourcebundle/root.res Binary files differindex 62cb48c457..62cb48c457 100755..100644 --- a/ext/intl/tests/_files/resourcebundle/root.res +++ b/ext/intl/tests/_files/resourcebundle/root.res |
