diff options
| author | Rickard Green <[email protected]> | 2012-11-16 09:31:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-11-16 09:31:56 +0100 |
| commit | cb11b4d6ec812813d0df07facc02ac5bd47e6851 (patch) | |
| tree | 355c2048bf1fcee6392a32be9ed921b3caa3c188 /system | |
| parent | 9b7d4359fd771fc3e7589dc91e091c7c35a65807 (diff) | |
| parent | 15f3cb7cb7074d507f70e778862e285e844b8546 (diff) | |
| download | otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.tar.gz otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.tar.bz2 otp-cb11b4d6ec812813d0df07facc02ac5bd47e6851.zip | |
Merge branch 'maint'
* maint:
Add clearer warnings about misuse of NIF and driver functionality
Fix erlang:memory(ets)
Conflicts:
erts/emulator/beam/erl_db.c
Diffstat (limited to 'system')
0 files changed, 0 insertions, 0 deletions