1
0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-03 10:07:47 +01:00
tgseclib/phpseclib
Andreas Fischer f85d333912 Merge branch 'master' into php5
* master:
  phpseclib_is_includable() -> phpseclib_resolve_include_path()
  Drop Net_SSH2::_is_includable() method.
  Random: a few changes to the stream_resolve_include_path_function
  Replace stream_resolve_include_path with phpseclib_is_includable.
  Random: add explanatory comment
  SSH2: replace _is_includable() with stream_resolve_include_path
  Random: include the Crypt_* classes if they're available

Conflicts:
	tests/bootstrap.php
2014-06-19 16:09:23 +02:00
..
Crypt Merge branch 'master' into php5 2014-06-19 16:09:23 +02:00
File Merge branch 'master' into php5 2014-06-17 00:36:54 +02:00
Math Merge branch 'master' into php5 2014-06-16 17:00:00 +02:00
Net Merge branch 'master' into php5 2014-06-19 16:09:23 +02:00
System/SSH Change constructors from class name to __construct(). 2014-06-16 17:06:34 +02:00
openssl.cnf Cleaned up whitespace 2014-01-18 17:29:25 +00:00