aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-06 14:30:20 +0100
committerMicael Karlberg <[email protected]>2012-02-06 14:30:20 +0100
commit2d97f0e5f13bf22d92dbc6df18787581eb462c41 (patch)
treebac265730b859dc87f0467464be4cd142098c4ef /erts/etc
parentab2ba6f1b0713fbe5c78f67aeefb73ffc006e995 (diff)
parent0c9547c384ba9d299d4a73bdf2a514c2b47128cd (diff)
downloadotp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.tar.gz
otp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.tar.bz2
otp-2d97f0e5f13bf22d92dbc6df18787581eb462c41.zip
Merge branch 'maint-r15' into maint
Conflicts: erts/vsn.mk
Diffstat (limited to 'erts/etc')
0 files changed, 0 insertions, 0 deletions