aboutsummaryrefslogtreecommitdiffstats
path: root/erts/obj
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-06-03 11:44:15 +0200
committerLukas Larsson <[email protected]>2014-06-03 11:44:15 +0200
commita4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (patch)
tree5222de0b142134864bdefbbfb8fa3d92d2da57c3 /erts/obj
parent6c2c2d2026ed7f2243af98cbe7bbf7f58883af10 (diff)
parent74d314b0085d5b83b1c7e9aefee8e770b66f93cb (diff)
downloadotp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.tar.gz
otp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.tar.bz2
otp-a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0.zip
Merge branch 'lukas/erts/git_vsn_script_fix/OTP-11961' into maint
* lukas/erts/git_vsn_script_fix/OTP-11961: erts: Fix git version script
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions