diff options
| author | Lars Thorsen <[email protected]> | 2015-05-20 10:12:46 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-05-20 10:12:46 +0200 |
| commit | 7b81ed532898c735ad8901723df373e5f0246127 (patch) | |
| tree | 5f69565b5016fb08d3bd62ecaf53fa12d4cb7c51 /lib/orber/src/orber.app.src | |
| parent | fd63f2b7108e2607e43d709e6d3885e4a7406ec8 (diff) | |
| parent | 5bd9afcd35d1a5c46dce8e75c650841a3061f45b (diff) | |
| download | otp-7b81ed532898c735ad8901723df373e5f0246127.tar.gz otp-7b81ed532898c735ad8901723df373e5f0246127.tar.bz2 otp-7b81ed532898c735ad8901723df373e5f0246127.zip | |
Merge branch 'master' of git-server:otp
Conflicts:
lib/orber/src/orber.app.src
Diffstat (limited to 'lib/orber/src/orber.app.src')
| -rw-r--r-- | lib/orber/src/orber.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src index 8d2431338f..217c1b247f 100644 --- a/lib/orber/src/orber.app.src +++ b/lib/orber/src/orber.app.src @@ -105,7 +105,7 @@ {env, []}, {mod, {orber, []}}, {runtime_dependencies, ["stdlib-2.5","ssl-5.3.4","mnesia-4.12","kernel-3.0", - "inets-5.10","erts-6.0"]} + "inets-5.10","erts-7.0"]} ]}. |