aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-10 13:50:54 +0100
committerMarcus Arendt <[email protected]>2014-11-10 13:50:54 +0100
commit258c7a49c2ea25e034b6e9de8f31eb323e8a2c29 (patch)
tree1307ce9d65d88c6357c9dea4b568ff75734fd7bb /erts/include
parent6af3ab986ac6561db52b79fb7a6f646c4314c4e2 (diff)
parent7ee7b013bc5d7f045c5d8d8d63125fb3bdbb6b98 (diff)
downloadotp-258c7a49c2ea25e034b6e9de8f31eb323e8a2c29.tar.gz
otp-258c7a49c2ea25e034b6e9de8f31eb323e8a2c29.tar.bz2
otp-258c7a49c2ea25e034b6e9de8f31eb323e8a2c29.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions