diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-28 15:49:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 15:49:23 +0200 |
| commit | 1aaf8958c019a1d0fd03de0677ccd2a98bc11553 (patch) | |
| tree | 9a0606a40173620b4c1f5543b64f4fb53fa3cb6a | |
| parent | 30912d3c49a6f70fbdb01c355afd1f7b1fb62c99 (diff) | |
| parent | 4c6c6e297e4e73ba99b882cdc622a8a439dafeda (diff) | |
| download | otp-1aaf8958c019a1d0fd03de0677ccd2a98bc11553.tar.gz otp-1aaf8958c019a1d0fd03de0677ccd2a98bc11553.tar.bz2 otp-1aaf8958c019a1d0fd03de0677ccd2a98bc11553.zip | |
Merge branch 'dev' into major
* dev:
Prepare for release
| -rw-r--r-- | lib/odbc/src/odbc.appup.src | 6 | ||||
| -rw-r--r-- | lib/odbc/vsn.mk | 2 |
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 |