aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.h
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-08-31 11:42:07 +0200
committerIngela Anderton Andin <[email protected]>2011-08-31 11:42:07 +0200
commite813241e103aa74d4daf025564b259f3fb9aca5a (patch)
tree91a83b8735d66b91b382409748b398c023b5dce3 /erts/emulator/beam/erl_nif.h
parent03b7d0ab7b998ab498349ebbffda01daadabab8c (diff)
parentbf8f3e3d5d928dfc63408439379d7a39880e730b (diff)
downloadotp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.gz
otp-e813241e103aa74d4daf025564b259f3fb9aca5a.tar.bz2
otp-e813241e103aa74d4daf025564b259f3fb9aca5a.zip
Merge remote branch 'upstream/dev' into major
* upstream/dev: Use inet and gen_* dialyzer specs
Diffstat (limited to 'erts/emulator/beam/erl_nif.h')
0 files changed, 0 insertions, 0 deletions