aboutsummaryrefslogtreecommitdiffstats
path: root/system/COPYRIGHT
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-06-04 09:23:17 +0200
committerIngela Anderton Andin <[email protected]>2019-06-04 09:23:17 +0200
commitc8ca7f3a2e4583c71e7aa740ede1a2630c09f064 (patch)
treecc27470d2652b19d8aa3da6928298f09c32e4706 /system/COPYRIGHT
parent3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985 (diff)
parent9127de8d0204755a7a95b674e77c6aa0583efce0 (diff)
downloadotp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.tar.gz
otp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.tar.bz2
otp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/src/kernel.appup.src # lib/kernel/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/src/stdlib.appup.src # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
Diffstat (limited to 'system/COPYRIGHT')
0 files changed, 0 insertions, 0 deletions