granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6de9152 3fbacdc)

author	Anatol Belski <ab@php.net>
	Tue, 29 Apr 2014 11:46:38 +0000 (13:46 +0200)
committer	Anatol Belski <ab@php.net>
	Tue, 29 Apr 2014 11:46:38 +0000 (13:46 +0200)
commit	3023257ff0af0ff2c98b0fbbfce862d31d040fa4
tree	50e2dc68e597506b72005e5f8b5f9d6876299849	tree \| snapshot
parent	6de915205ca7516684d7238e9d61068bf630198c	commit \| diff
parent	3fbacdc6e87383b0e0765850398aaae6547c5216	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #66431 Special Character via COM Interface (CP_UTF8)

ext/com_dotnet/com_variant.c

Unnamed repository; edit this file 'description' to name the repository.