Merge branch '2.0'

* 2.0:
  composer: Remove include path. No longer necessary due to PSR4 autoloading.
This commit is contained in:
Andreas Fischer 2015-08-10 12:46:53 +02:00
commit 78a6a7e847
2 changed files with 1 additions and 2 deletions

View File

@ -60,7 +60,6 @@
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations." "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
}, },
"include-path": ["phpseclib/"],
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"phpseclib\\": "phpseclib/" "phpseclib\\": "phpseclib/"

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "b24ab20be15b6312e532ee2ffa18d5fa", "hash": "3c1701cdae74c93eba5311e59f11cdb6",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {