diff options
author | Marcus Arendt <[email protected]> | 2014-08-22 09:50:48 +0200 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2014-08-22 09:50:48 +0200 |
commit | b104e409c3df5da4df12a29db3af32e24ea5f6e1 (patch) | |
tree | 1d396b9555ed281259858671219f153cc041524a /lib/kernel/src | |
parent | ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9 (diff) | |
parent | 3d74589f0519da8c81f1cb4bff6c01a0011a1063 (diff) | |
download | otp-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