aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-10-18 11:07:28 +0200
committerHans Nilsson <[email protected]>2016-10-18 11:07:28 +0200
commit05ad4bf027f2b0d489ddd4c966dc3aa1ff9eb84c (patch)
treed53e6bf15b6b0525a41fe9417547ec5f4c4205e8 /system
parent32ae962134486a342ce2913dfcfd638da558b62e (diff)
parent1550204bed17ecdcc59a53332bcdfa2ba246944a (diff)
downloadotp-05ad4bf027f2b0d489ddd4c966dc3aa1ff9eb84c.tar.gz
otp-05ad4bf027f2b0d489ddd4c966dc3aa1ff9eb84c.tar.bz2
otp-05ad4bf027f2b0d489ddd4c966dc3aa1ff9eb84c.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'system')
0 files changed, 0 insertions, 0 deletions