aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-06-28 16:52:19 +0200
committerMicael Karlberg <[email protected]>2011-06-28 16:52:19 +0200
commitd1e636f236a4a76e999ff516718c814f3eeed617 (patch)
treed2add85a905443e686a9714f81fbaab5c27fc5b0 /lib
parent7492a31ce78e61d36713e4e88ac06fcc7ca9ddf7 (diff)
parent4c6c6e297e4e73ba99b882cdc622a8a439dafeda (diff)
downloadotp-d1e636f236a4a76e999ff516718c814f3eeed617.tar.gz
otp-d1e636f236a4a76e999ff516718c814f3eeed617.tar.bz2
otp-d1e636f236a4a76e999ff516718c814f3eeed617.zip
Merge branch 'dev' of super:otp into dev
Diffstat (limited to 'lib')
-rw-r--r--lib/odbc/src/odbc.appup.src6
-rw-r--r--lib/odbc/vsn.mk2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index 2a6667ccd3..f3a3af8c29 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1,8 +1,10 @@
%% -*- erlang -*-
{"%VSN%",
[
- {"2.10.9", [{restart_application, ssl}]}
+ {"2.10.10", [{restart_application, odbc}]},
+ {"2.10.9", [{restart_application, odbc}]}
],
[
- {"2.10.9", [{restart_application, ssl}]}
+ {"2.10.10", [{restart_application, odbc}]},
+ {"2.10.9", [{restart_application, odbc}]}
]}.
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 42a51be33e..120ed9ee3d 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.10.10
+ODBC_VSN = 2.10.11