aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2013-12-05 13:31:44 +0100
committerRaimo Niskanen <[email protected]>2013-12-05 13:31:44 +0100
commit66d8193c415b76a8193cb8321d7c93136e5e06c5 (patch)
tree70b0968e77a60d12d7911289ba21a7418b44cfe4 /lib/sasl
parent0619bc4c1360144371993806e961ef4f68580762 (diff)
parentcdf8fdf8f59f06d18749c71b772bc468d36b6afd (diff)
downloadotp-66d8193c415b76a8193cb8321d7c93136e5e06c5.tar.gz
otp-66d8193c415b76a8193cb8321d7c93136e5e06c5.tar.bz2
otp-66d8193c415b76a8193cb8321d7c93136e5e06c5.zip
Merge branch 'maint'
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/src/release_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 1ad60af7c2..ccd84f0c37 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1102,7 +1102,7 @@ new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Maste
Args = [ToVsn,Opts],
{ok,FromBoot} = read_file(FromBootFile,Masters),
{ok,ToBoot} = read_file(ToBootFile,Masters),
- {{_,_,KernelPath},{_,_,SaslPath},{_,_,StdlibPath}} = BaseLibs,
+ {{_,_,KernelPath},{_,_,StdlibPath},{_,_,SaslPath}} = BaseLibs,
Paths = {filename:join(KernelPath,"ebin"),
filename:join(StdlibPath,"ebin"),
filename:join(SaslPath,"ebin")},