aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-01 16:34:52 +0200
committerFredrik Gustafsson <[email protected]>2013-07-01 16:34:52 +0200
commitb869f69e056c1e9d8850c51bb51fca03aa7d5962 (patch)
tree34e526bf2f1d2362903cf88712328f51ce471c73 /erts/include
parentcc6e4b6ce7c2c82fb3039a9e6d46a2c90fd45cf2 (diff)
parentadc8b048e72ad774a431b32088b4df8b47d509f8 (diff)
downloadotp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.gz
otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.bz2
otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions