diff options
author | Ingela Anderton Andin <[email protected]> | 2012-03-07 08:55:41 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-03-07 08:55:41 +0100 |
commit | a7714f269498e51f02c598446ef8626c380d30b1 (patch) | |
tree | 94d2f64fd63024ed33619c5b333abd59eaa30537 /erts/etc/win32/toolbar.bmp | |
parent | 1dafd582ac41e9f86a973a367fc40d643c25c424 (diff) | |
parent | 6c5153c70e9ac02e2a79bbc0c9a5409679e5fe66 (diff) | |
download | otp-a7714f269498e51f02c598446ef8626c380d30b1.tar.gz otp-a7714f269498e51f02c598446ef8626c380d30b1.tar.bz2 otp-a7714f269498e51f02c598446ef8626c380d30b1.zip |
Merge branch 'ia/ssh/windows-sftp-tests' into maint
* ia/ssh/windows-sftp-tests:
Skip set_attributes test on windows due to known erts bug in file:read_file_info/1
Diffstat (limited to 'erts/etc/win32/toolbar.bmp')
0 files changed, 0 insertions, 0 deletions