diff options
| author | Björn Gustavsson <[email protected]> | 2017-02-24 10:19:05 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-02-24 10:19:05 +0100 |
| commit | 39b43dd10605f60d580ba9a73136713a776c635d (patch) | |
| tree | 3e9f06cc4052bfb6da26767411458332abb42b36 /erts/emulator | |
| parent | 4f83fcd6ea5ff5bfa68f23cd34550b4705d17574 (diff) | |
| parent | 133645d9a24e6a6d7123370ef332ca478598040e (diff) | |
| download | otp-39b43dd10605f60d580ba9a73136713a776c635d.tar.gz otp-39b43dd10605f60d580ba9a73136713a776c635d.tar.bz2 otp-39b43dd10605f60d580ba9a73136713a776c635d.zip | |
Merge branch 'maint'
* maint:
filename: Add safe_relative_path/1
Conflicts:
lib/stdlib/src/filename.erl
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions