diff options
author | Fredrik Gustafsson <[email protected]> | 2012-08-24 11:23:15 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-08-24 11:23:15 +0200 |
commit | 313355eb792d9bc811b5cb979a7cf9fbc9a6c075 (patch) | |
tree | 1b770bd456a3aa7f5caf3711a966858549a44a0e /lib | |
parent | 8175aaab8812723e4a77ea162e49cc0900b00fef (diff) | |
parent | 4be9622555222e9ec7f1c49d8a86cc336da2875a (diff) | |
download | otp-313355eb792d9bc811b5cb979a7cf9fbc9a6c075.tar.gz otp-313355eb792d9bc811b5cb979a7cf9fbc9a6c075.tar.bz2 otp-313355eb792d9bc811b5cb979a7cf9fbc9a6c075.zip |
Merge branch 'mz/odbc-support-param_query/OTP-10206' into maint
Diffstat (limited to 'lib')
-rw-r--r-- | lib/odbc/src/odbc.appup.src | 8 | ||||
-rw-r--r-- | lib/odbc/vsn.mk | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src index 853323da09..c7c83ea079 100644 --- a/lib/odbc/src/odbc.appup.src +++ b/lib/odbc/src/odbc.appup.src @@ -1,12 +1,8 @@ %% -*- erlang -*- {"%VSN%", [ - {"2.10.11", [{restart_application, odbc}]}, - {"2.10.10", [{restart_application, odbc}]}, - {"2.10.9", [{restart_application, odbc}]} + {<<"2\\.*">>, [{restart_application, odbc}]} ], [ - {"2.10.11", [{restart_application, odbc}]}, - {"2.10.10", [{restart_application, odbc}]}, - {"2.10.9", [{restart_application, odbc}]} + {<<"2\\.*">>, [{restart_application, odbc}]} ]}. diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk index fb6e208a52..3bb2fe5bce 100644 --- a/lib/odbc/vsn.mk +++ b/lib/odbc/vsn.mk @@ -1 +1 @@ -ODBC_VSN = 2.10.12 +ODBC_VSN = 2.10.13 |