aboutsummaryrefslogtreecommitdiffstats
path: root/otp_patch_apply
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-07-15 12:33:41 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-07-15 12:33:41 +0200
commit01a46375d8aae78d4ad01c043b554e58c5b40768 (patch)
treef705d1f2d4abafb9739831e9683e60feaad6a2f7 /otp_patch_apply
parentd050a82a419231e8435e6c3e2e98972c447b8ce6 (diff)
parent440445cfd0cbeee8f2bb86b99b6d16caf7a5c9c7 (diff)
downloadotp-01a46375d8aae78d4ad01c043b554e58c5b40768.tar.gz
otp-01a46375d8aae78d4ad01c043b554e58c5b40768.tar.bz2
otp-01a46375d8aae78d4ad01c043b554e58c5b40768.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'otp_patch_apply')
0 files changed, 0 insertions, 0 deletions