diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-13 12:31:32 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-13 12:31:32 +0200 |
| commit | 74e7bf593c302dccd2df1561a22ad25b91a4864b (patch) | |
| tree | 129ef564368ce20848373bd6c7fe5bae889e808d /erts/ntbuild.erl | |
| parent | 66829b77b0becadecb2fef480b66f69e95498bf7 (diff) | |
| parent | 59c43904b029c5ccde511fcb83a809ed8370d887 (diff) | |
| download | otp-74e7bf593c302dccd2df1561a22ad25b91a4864b.tar.gz otp-74e7bf593c302dccd2df1561a22ad25b91a4864b.tar.bz2 otp-74e7bf593c302dccd2df1561a22ad25b91a4864b.zip | |
Merge branch 'dev' into major
Conflicts:
erts/emulator/test/nif_SUITE.erl
erts/emulator/test/nif_SUITE_data/nif_SUITE.c
sverker/enif_make_int64-halfword/OTP-9394
Diffstat (limited to 'erts/ntbuild.erl')
0 files changed, 0 insertions, 0 deletions