summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
authorGustavo André dos Santos Lopes <cataphract@php.net>2012-07-30 10:31:10 +0200
committerGustavo André dos Santos Lopes <cataphract@php.net>2012-07-30 10:31:10 +0200
commitdec7bad63504e828f2111265d1bb6624951c0548 (patch)
tree343caeece98205189bdb1b2426c2663bf70ad633 /ext/intl/php_intl.c
parente0c014deadc4d858507b83fab49e95b7f06954dc (diff)
parent7e3e1837c8e60ad87e9b7aee6cb306a843f5c784 (diff)
downloadphp-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/php_intl.c')
-rw-r--r--[-rwxr-xr-x]ext/intl/php_intl.c0
1 files changed, 0 insertions, 0 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index efe0ddd242..efe0ddd242 100755..100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c