diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-17 10:16:27 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-17 10:16:27 +0100 |
| commit | 28f3bae60a4edb9432c29469f6a3c031e0859104 (patch) | |
| tree | 852089f6c59811361af4cdabb652ac0892ec2967 /erts | |
| parent | ae61174845dde2ddda537d57ace5b1124b7f4191 (diff) | |
| parent | 577125cc69feb5c14fa7e13edd3c3157f9c4a0ec (diff) | |
| download | otp-28f3bae60a4edb9432c29469f6a3c031e0859104.tar.gz otp-28f3bae60a4edb9432c29469f6a3c031e0859104.tar.bz2 otp-28f3bae60a4edb9432c29469f6a3c031e0859104.zip | |
Merge branch 'bjorn/kernel/code_server-normalized-paths/OTP-13410'
* bjorn/kernel/code_server-normalized-paths/OTP-13410:
code_server: Normalize the pathnames for all loaded modules
Update preloaded modules
init: Correct spec for fetch_loaded/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 44588 -> 44608 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex 8ac7f5b471..9d2dd38f3a 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index ed65c57c0d..5de3732c20 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -129,7 +129,7 @@ bs2ss(L) -> get_status() -> request(get_status). --spec fetch_loaded() -> [atom()]. +-spec fetch_loaded() -> [{module(),file:filename()}]. fetch_loaded() -> request(fetch_loaded). |