aboutsummaryrefslogtreecommitdiffstats
path: root/prebuild.skip
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-11-16 09:31:56 +0100
committerRickard Green <[email protected]>2012-11-16 09:31:56 +0100
commitcb11b4d6ec812813d0df07facc02ac5bd47e6851 (patch)
tree355c2048bf1fcee6392a32be9ed921b3caa3c188 /prebuild.skip
parent9b7d4359fd771fc3e7589dc91e091c7c35a65807 (diff)
parent15f3cb7cb7074d507f70e778862e285e844b8546 (diff)
downloadotp-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 'prebuild.skip')
0 files changed, 0 insertions, 0 deletions