summaryrefslogtreecommitdiff
path: root/win32/php_win32_globals.h
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-10-08 22:52:03 -0700
committerChristopher Jones <sixd@php.net>2012-10-08 22:52:03 -0700
commit018868cfce3be896f65b82ee11a8fafb2da9865e (patch)
tree3de128d1be145966b25f82396f3a88ad97693867 /win32/php_win32_globals.h
parent6979632221feaba4a7f7a2b135b3d1b6942b56de (diff)
parent75a2c0d71555a432db170b37720a4f3b4cd8f224 (diff)
downloadphp-git-018868cfce3be896f65b82ee11a8fafb2da9865e.tar.gz
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: Fixed bug #63236 (Executable permission on various source files) Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
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