summaryrefslogtreecommitdiff
path: root/win32/php_win32_globals.h
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-17 17:23:37 +0200
committerAndrey Hristov <andrey@php.net>2012-10-17 17:23:37 +0200
commit7314ed535f93841ff2d2bca5e65afcb0f2b003bb (patch)
treebceec620f2cb1d5f255196e00ae7ea1187b41fe2 /win32/php_win32_globals.h
parentc50d732f7686352381d44926988aca194204433d (diff)
parentda541ff561e0ac6ac72d2efd8b785ecfeef868dc (diff)
downloadphp-git-7314ed535f93841ff2d2bca5e65afcb0f2b003bb.tar.gz
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Diffstat (limited to 'win32/php_win32_globals.h')
-rw-r--r--[-rwxr-xr-x]win32/php_win32_globals.h0
1 files changed, 0 insertions, 0 deletions
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index 1fcfb60365..1fcfb60365 100755..100644
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h