aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-02-20 19:21:00 +0100
committerSverker Eriksson <[email protected]>2018-02-20 19:21:00 +0100
commit6221c73942b158081a5d3e498631d758409b6b62 (patch)
tree8581af7e0a793546100b907d749d58988c20fb47 /erts
parent6b9d92005cf3eb9b2d8dc2370dd089f8d262fa06 (diff)
parente55df241937d62ec15fedac4a9aa4c4c34fddee5 (diff)
downloadotp-6221c73942b158081a5d3e498631d758409b6b62.tar.gz
otp-6221c73942b158081a5d3e498631d758409b6b62.tar.bz2
otp-6221c73942b158081a5d3e498631d758409b6b62.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erl_prim_loader.beambin54268 -> 54160 bytes
-rw-r--r--erts/preloaded/src/erl_prim_loader.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 2d86dd3843..02e77bfbb2 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
Binary files differ
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index d16fe5a0bc..b82b9f5b46 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -56,7 +56,7 @@
-export([purge_archive_cache/0]).
%% Used by init and the code server.
--export([get_modules/2,get_modules/3]).
+-export([get_modules/2,get_modules/3, is_basename/1]).
-include_lib("kernel/include/file.hrl").