aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2013-11-26 11:40:36 +0100
committerRaimo Niskanen <[email protected]>2013-11-26 12:24:13 +0100
commit666884a245fd57f04e0a15b0602c46bf271966f0 (patch)
treea9775f8a1f20947cc3c04d55c0b8d518f9869a27 /erts/include
parentc79eb97831b0f86f3c4237f51757a3aecce1c264 (diff)
parentc4592b6941cf66cd89fb8f9664e021151dc11b8d (diff)
downloadotp-666884a245fd57f04e0a15b0602c46bf271966f0.tar.gz
otp-666884a245fd57f04e0a15b0602c46bf271966f0.tar.bz2
otp-666884a245fd57f04e0a15b0602c46bf271966f0.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions