aboutsummaryrefslogtreecommitdiffstats
path: root/lib/odbc/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-06-28 17:08:56 +0200
committerIngela Anderton Andin <[email protected]>2011-06-28 17:08:56 +0200
commitee679e41535dd83aba7c8fb55fa12bdc6e89313c (patch)
tree609b2b36ae8ad76b77e80c999205bc736306555b /lib/odbc/test
parent17f389d3d79e7c020431f3b6941cc301a977c5d8 (diff)
parent2262ba2690ba5a977576d04461bdc36f6f73d825 (diff)
downloadotp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.tar.gz
otp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.tar.bz2
otp-ee679e41535dd83aba7c8fb55fa12bdc6e89313c.zip
Merge branch 'ia/ssl/use-erlang-send-after-instead-of-timer-send-after' into dev
* ia/ssl/use-erlang-send-after-instead-of-timer-send-after: Use erlang:send_after instead of timer:send_after Conflicts: lib/ssl/test/ssl_session_cache_SUITE.erl
Diffstat (limited to 'lib/odbc/test')
0 files changed, 0 insertions, 0 deletions