aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-11-05 15:33:24 +0100
committerMarcus Arendt <[email protected]>2014-11-05 15:33:24 +0100
commit682a6082159568f40615f03d12d44ee70edd14c6 (patch)
treed8e0d99da58c138834e744f4186a76a238c6d5dc /erts/configure.in
parent7513bb7670cf7081c4b70e240f99f9424b612f0b (diff)
parent9417f044ee3c291c2ea343c203aebdcc40597226 (diff)
downloadotp-682a6082159568f40615f03d12d44ee70edd14c6.tar.gz
otp-682a6082159568f40615f03d12d44ee70edd14c6.tar.bz2
otp-682a6082159568f40615f03d12d44ee70edd14c6.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION
Diffstat (limited to 'erts/configure.in')
0 files changed, 0 insertions, 0 deletions