aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-01 15:36:31 +0100
committerBjörn Gustavsson <[email protected]>2012-02-01 15:36:31 +0100
commitab2ba6f1b0713fbe5c78f67aeefb73ffc006e995 (patch)
tree06db0aa1466a2cac76f45fb216f0ccaac8c9700a /erts/etc/common
parentd4b77bdf9af44db28fcc64faf6eac1c7b6faf185 (diff)
parent135c76d6b80182d5c441ef0e07e2f271dcad8aed (diff)
downloadotp-ab2ba6f1b0713fbe5c78f67aeefb73ffc006e995.tar.gz
otp-ab2ba6f1b0713fbe5c78f67aeefb73ffc006e995.tar.bz2
otp-ab2ba6f1b0713fbe5c78f67aeefb73ffc006e995.zip
Merge branch 'maint-r14' into maint
* maint-r14: Prepare release
Diffstat (limited to 'erts/etc/common')
0 files changed, 0 insertions, 0 deletions