diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
| commit | a60a923d6ad01029494dfad34685983426b75093 (patch) | |
| tree | 6b73a6f5f9ecaac82c784345daf1a11055bcbd78 /lib/crypto/src/crypto.appup.src | |
| parent | e6c7db595f50ae0606b3177451bcfcdc28f9d3c0 (diff) | |
| parent | 56e08cb2d1faa279961413729e48ef1f3275a575 (diff) | |
| download | otp-a60a923d6ad01029494dfad34685983426b75093.tar.gz otp-a60a923d6ad01029494dfad34685983426b75093.tar.bz2 otp-a60a923d6ad01029494dfad34685983426b75093.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/crypto/src/crypto.appup.src')
| -rw-r--r-- | lib/crypto/src/crypto.appup.src | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/crypto/src/crypto.appup.src b/lib/crypto/src/crypto.appup.src index b39ef734eb..5b4ce5acee 100644 --- a/lib/crypto/src/crypto.appup.src +++ b/lib/crypto/src/crypto.appup.src @@ -1,7 +1,8 @@ +%% -*- erlang -*- %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -17,6 +18,11 @@ %% %CopyrightEnd% %% {"%VSN%", - [], - [] -}. + [ + {<<"2\\.*">>, [{restart_application, crypto}]} + {<<"1\\.*">>, [{restart_application, crypto}]} + ], + [ + {<<"2\\.*">>, [{restart_application, crypto}]} + {<<"1\\.*">>, [{restart_application, crypto}]} + ]}. |