aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-22 09:50:48 +0200
committerMarcus Arendt <[email protected]>2014-08-22 09:50:48 +0200
commitb104e409c3df5da4df12a29db3af32e24ea5f6e1 (patch)
tree1d396b9555ed281259858671219f153cc041524a /lib/kernel/src
parentae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9 (diff)
parent3d74589f0519da8c81f1cb4bff6c01a0011a1063 (diff)
downloadotp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.tar.gz
otp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.tar.bz2
otp-b104e409c3df5da4df12a29db3af32e24ea5f6e1.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Conflicts: OTP_VERSION
Diffstat (limited to 'lib/kernel/src')
0 files changed, 0 insertions, 0 deletions