]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 24 May 2012 22:23:51 +0000 (00:23 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 24 May 2012 22:23:51 +0000 (00:23 +0200)
* PHP-5.3:
  Fix bug #62146  com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN

1  2 
ext/com_dotnet/com_misc.c
ext/com_dotnet/com_olechar.c
ext/com_dotnet/com_persist.c
ext/com_dotnet/com_typeinfo.c
ext/com_dotnet/com_variant.c
ext/com_dotnet/com_wrapper.c
ext/com_dotnet/php_com_dotnet_internal.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge