]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7b1d76 7dbb1bb)
Merge PR #430 gost-crypto
authorMichael Wallner <mike@php.net>
Thu, 3 Oct 2013 14:20:00 +0000 (16:20 +0200)
committerMichael Wallner <mike@php.net>
Thu, 3 Oct 2013 14:20:00 +0000 (16:20 +0200)
Merge branch 'master' of github.com:manuelm/php-src

* 'master' of github.com:manuelm/php-src:
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST


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