diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-18 09:37:42 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-18 09:37:42 +0100 |
| commit | b2e4599affa6718bba60ef3846d130513e9a740d (patch) | |
| tree | 116115e2a365d204eb7b1ffc706ad8a9c69bf3fa /bootstrap/lib/kernel | |
| parent | f07816ab2826d2a4082442f1d8ca71b7bfb89a47 (diff) | |
| parent | 22c39699f35142063f69c45bdb919bcba468fede (diff) | |
| download | otp-b2e4599affa6718bba60ef3846d130513e9a740d.tar.gz otp-b2e4599affa6718bba60ef3846d130513e9a740d.tar.bz2 otp-b2e4599affa6718bba60ef3846d130513e9a740d.zip | |
Merge branch 'mhssler/add-os-unsetenv/OTP-11446' into maint
* mhssler/add-os-unsetenv/OTP-11446:
erts: remove ?line macro in testcases
Update primary bootstrap
Add os:unsetenv/1
Diffstat (limited to 'bootstrap/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/os.beam | bin | 5280 -> 5332 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/kernel/ebin/os.beam b/bootstrap/lib/kernel/ebin/os.beam Binary files differindex bb981bbf89..5161ebea09 100644 --- a/bootstrap/lib/kernel/ebin/os.beam +++ b/bootstrap/lib/kernel/ebin/os.beam |