aboutsummaryrefslogtreecommitdiffstats
path: root/xcomp
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-04-27 14:38:24 +0200
committerSverker Eriksson <[email protected]>2012-04-27 14:38:24 +0200
commit3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c (patch)
treec8e2821c3413475ca9cbf6ee2f5bbe8a1ce5230e /xcomp
parent33fe8806939849c47b8ec5de91b8e8ef94a9f1df (diff)
parent46f5b571ba92c29a0471d9619f372b102ec4a6c0 (diff)
downloadotp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.tar.gz
otp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.tar.bz2
otp-3334f1fa43cf9e2dbcfadc7be7af9ecf16a3272c.zip
Merge branch 'maint-r15' into maint
Conflicts: erts/vsn.mk
Diffstat (limited to 'xcomp')
0 files changed, 0 insertions, 0 deletions