aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-01 15:15:15 +0200
committerHenrik Nord <[email protected]>2015-10-01 15:15:15 +0200
commitc702c1a7e29894025f530adbd9147f4bb892985b (patch)
treeccaab0a00f97e6a9eb9b78f47b5bebb7b578da73 /erts/include
parent382b1fde9f28090a41344d4e66bdbd5a1f4a7327 (diff)
parentc1d11c28ca748075cae5330102bccd10a56b8686 (diff)
downloadotp-c702c1a7e29894025f530adbd9147f4bb892985b.tar.gz
otp-c702c1a7e29894025f530adbd9147f4bb892985b.tar.bz2
otp-c702c1a7e29894025f530adbd9147f4bb892985b.zip
Merge branch 'maint'
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions