diff options
author | Hans Nilsson <[email protected]> | 2013-12-05 12:13:59 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2013-12-05 12:13:59 +0100 |
commit | 2918674d8c83ed1e38a8a8bd6b21f916ee5303f9 (patch) | |
tree | 5f0b9faf4525703625795cf4d79d56100bd188ce /lib/wx/src/gen/wxPalette.erl | |
parent | ce6d89faa684f39fbd17dfb10b4f95a221b8ac9a (diff) | |
parent | 3d620083627f707fa19565710402517f5e74531f (diff) | |
download | otp-2918674d8c83ed1e38a8a8bd6b21f916ee5303f9.tar.gz otp-2918674d8c83ed1e38a8a8bd6b21f916ee5303f9.tar.bz2 otp-2918674d8c83ed1e38a8a8bd6b21f916ee5303f9.zip |
Merge branch 'hans/inets/ftpc_test_fail' into maint
* hans/inets/ftpc_test_fail:
inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
Diffstat (limited to 'lib/wx/src/gen/wxPalette.erl')
0 files changed, 0 insertions, 0 deletions