diff options
| author | Anders Svensson <[email protected]> | 2014-03-30 13:35:29 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-03-30 13:35:29 +0200 |
| commit | c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231 (patch) | |
| tree | eb0118cfdae1b763e8eb5b8e5f9afadf5ffffffa /lib/diameter/src/diameter.app.src | |
| parent | d02526929206dadc7c99a7f5e577b8c00803ff8c (diff) | |
| parent | 5ca206af45b3195233991dfe820e9fb636800a33 (diff) | |
| download | otp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.tar.gz otp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.tar.bz2 otp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.zip | |
Merge branch 'anders/diameter/17.0_release/OTP-11605'
* anders/diameter/17.0_release/OTP-11605:
Move info modules into own subdirectory
Include compiler and info modules in app file
Remove unused diameter_dbg:log/4
Remove case expecting a pre-R16B return value from os:type/1
Fix doc typo: required -> requires
Remove release note unrelated to functionality
Diffstat (limited to 'lib/diameter/src/diameter.app.src')
| -rw-r--r-- | lib/diameter/src/diameter.app.src | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src index 509de9e595..d2290aeccc 100644 --- a/lib/diameter/src/diameter.app.src +++ b/lib/diameter/src/diameter.app.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-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 @@ -20,9 +20,18 @@ {application, diameter, [{description, "Diameter protocol"}, {vsn, "%VSN%"}, - {modules, [%MODULES%]}, + {modules, [ + %MODULES% + %,%COMPILER% + %,%INFO% + ]}, {registered, [%REGISTERED%]}, - {applications, [stdlib, kernel]}, + {applications, [ + stdlib, kernel + %, syntax_tools + %, runtime_tools + %, ssl + ]}, {env, []}, {mod, {diameter_app, []}}, {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-2.0","ssl-5.3.4", |