aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-05-05 15:05:11 +0200
committerSverker Eriksson <[email protected]>2011-05-05 15:05:11 +0200
commit8e6ae6d0be47fa7785b40788b9adb46ba47b894e (patch)
treec664ac5f3d09722ea6d4d8cc8f0943837242269d /otp_build
parentaa9497c99e4668c5f6a6a1bde2effcb8e9fb8617 (diff)
parent7050c922b25fe1306caffc7545a89e0ddc1de06a (diff)
downloadotp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.tar.gz
otp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.tar.bz2
otp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.zip
Merge branch 'maint-r14' into dev
Conflicts: erts/vsn.mk
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions