aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src/crypto.app.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-28 11:06:43 +0100
committerIngela Anderton Andin <[email protected]>2014-01-28 11:06:43 +0100
commitbb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (patch)
tree94dae2ff490c4193df939fc85927ac63af9542e1 /lib/crypto/src/crypto.app.src
parent75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (diff)
parent2b57228dd5993321a217a89dbe601d1e90b18f33 (diff)
downloadotp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.gz
otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.bz2
otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.zip
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/crypto/src/crypto.app.src')
-rw-r--r--lib/crypto/src/crypto.app.src14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/crypto/src/crypto.app.src b/lib/crypto/src/crypto.app.src
index 161ea7c9fe..d3084ff336 100644
--- a/lib/crypto/src/crypto.app.src
+++ b/lib/crypto/src/crypto.app.src
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. 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,16 +17,12 @@
%% %CopyrightEnd%
%%
{application, crypto,
- [{description, "CRYPTO version 2"},
+ [{description, "CRYPTO"},
{vsn, "%VSN%"},
{modules, [crypto,
- crypto_ec_curves,
- crypto_app,
- crypto_sup,
- crypto_server]},
- {registered, [crypto_sup, crypto_server]},
+ crypto_ec_curves]},
+ {registered, []},
{applications, [kernel, stdlib]},
- {env, []},
- {mod, {crypto_app, []}}]}.
+ {env, []}]}.