aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-08-29 16:16:26 +0200
committerHenrik Nord <[email protected]>2012-08-29 16:16:26 +0200
commit5a68678e673e3dfe5c24fa0495fbf61743c416a9 (patch)
treec8a30b6b88c549db0a0c69d524c1ea2463719090 /erts
parent0f89d26db03c7db52e49c75b238438b79684872f (diff)
parentbb1747c07f559f0563f37b4606cbfc5a1612db08 (diff)
downloadotp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.tar.gz
otp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.tar.bz2
otp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.zip
Merge branch 'maint'
Conflicts: README.md
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions