diff options
author | Anders Svensson <[email protected]> | 2011-09-27 20:26:47 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2011-09-27 20:26:47 +0200 |
commit | d897eea38983f0adfa0e8a2dc483879bc1126f94 (patch) | |
tree | 6b17d52c4e9dc2d6215363302c346bd8c6512e6d /lib/diameter/src/app/diameter.app.src | |
parent | 571bc8c6135cb902e7cf9429f1bfad67284f8f23 (diff) | |
parent | 58fe7b5e48ad95f14b05aae43a3a32122695da4e (diff) | |
download | otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.tar.gz otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.tar.bz2 otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.zip |
Merge branch 'dev' into major
Conflicts:
lib/diameter/src/app/Makefile
Diffstat (limited to 'lib/diameter/src/app/diameter.app.src')
-rw-r--r-- | lib/diameter/src/app/diameter.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/app/diameter.app.src b/lib/diameter/src/app/diameter.app.src index 119997953e..a806b5c78a 100644 --- a/lib/diameter/src/app/diameter.app.src +++ b/lib/diameter/src/app/diameter.app.src @@ -20,7 +20,7 @@ {application, diameter, [{description, "Diameter protocol"}, {vsn, "%VSN%"}, - {modules, [%APP_MODULES%,%COMPILER_MODULES%,%TRANSPORT_MODULES%]}, + {modules, [%APP_MODULES%,%TRANSPORT_MODULES%]}, {registered, []}, {applications, [stdlib, kernel]}, {env, []}, |