diff options
author | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:24:30 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:24:30 +0100 |
commit | 4d9dd06871d268942df763e556a0afb0bb6cf471 (patch) | |
tree | 020df21faf1409067cf8c92327ade0b7e1f856be /lib/xmerl/vsn.mk | |
parent | 4a9cf8de2125832cdc636693ec23f625f195b9e8 (diff) | |
parent | 489fac442f15f08adf7745fb2d399cd521f0db74 (diff) | |
download | otp-4d9dd06871d268942df763e556a0afb0bb6cf471.tar.gz otp-4d9dd06871d268942df763e556a0afb0bb6cf471.tar.bz2 otp-4d9dd06871d268942df763e556a0afb0bb6cf471.zip |
Merge branch 'ia/ssh/pass-phrase-protected-keys/OTP-6400' into maint
* ia/ssh/pass-phrase-protected-keys/OTP-6400:
Remove unused files from test data as it is confusing
Add support for key files protected by pass phrases
Diffstat (limited to 'lib/xmerl/vsn.mk')
0 files changed, 0 insertions, 0 deletions