aboutsummaryrefslogtreecommitdiffstats
path: root/EPLICENCE
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-01-24 09:58:33 +0100
committerIngela Anderton Andin <[email protected]>2014-01-24 09:58:33 +0100
commit7a838c3dfa765054303c347068ff1d02c392e3ef (patch)
tree923701ccac0c69e0b1e744613d2ee8adc7b61a30 /EPLICENCE
parentadc60ec29d54f77a8bcae9c795fc9ac7bdb8a803 (diff)
parentff670ef98fa2d859c7fb4737ef836890fdf91d68 (diff)
downloadotp-7a838c3dfa765054303c347068ff1d02c392e3ef.tar.gz
otp-7a838c3dfa765054303c347068ff1d02c392e3ef.tar.bz2
otp-7a838c3dfa765054303c347068ff1d02c392e3ef.zip
Merge branch 'maint'
Conflicts: otp_build
Diffstat (limited to 'EPLICENCE')
0 files changed, 0 insertions, 0 deletions