aboutsummaryrefslogtreecommitdiffstats
path: root/system/COPYRIGHT
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-06-30 16:24:37 +0200
committerSverker Eriksson <[email protected]>2015-06-30 16:24:37 +0200
commitf650523a85c0d365c95d71edffc063eadb2bc308 (patch)
tree331dc57e73c43f4ad4a2ad99addfbe58c5bbd0a9 /system/COPYRIGHT
parentd953952d8ee1429ac5637953db1e5c189b55c5fd (diff)
parent2e3a43ec4d0ce5e1055377ff32198017a1d083b4 (diff)
downloadotp-f650523a85c0d365c95d71edffc063eadb2bc308.tar.gz
otp-f650523a85c0d365c95d71edffc063eadb2bc308.tar.bz2
otp-f650523a85c0d365c95d71edffc063eadb2bc308.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'system/COPYRIGHT')
0 files changed, 0 insertions, 0 deletions