aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
AgeCommit message (Collapse)Author
2012-12-06Merge branch 'maint'Ingela Anderton Andin
Conflicts: erts/emulator/sys/vxworks/sys.c erts/vsn.mk lib/ssl/src/ssl_connection.erl lib/ssl/test/ssl_basic_SUITE.erl
2012-12-06Prepare releaseErlang/OTP
2012-09-05Update version numbersBjörn-Egil Dahlberg
2012-04-03Update version numbers for R15B02 devBjörn-Egil Dahlberg
2012-02-06Merge branch 'maint'Micael Karlberg
2012-02-06Merge branch 'maint-r15' into maintMicael Karlberg
Conflicts: erts/vsn.mk
2011-12-27Prepare releaseErlang/OTP
2011-12-15Update version numbersBjörn-Egil Dahlberg
2011-12-15Update version numberBjörn-Egil Dahlberg
2011-11-22Update system version to R15BBjörn-Egil Dahlberg
2011-11-22Revert "Update version numbers for pre-release of R15"Björn-Egil Dahlberg
This reverts commit e21ff9b0b69219ab3853be7e80813156113152b7.
2011-11-22Update version numbers for pre-release of R15OTP_R15ABjörn Gustavsson
2011-06-07Update version numbers for R15A developmentBjörn-Egil Dahlberg
2011-03-16Update version numbersBjörn-Egil Dahlberg
2010-12-08Update version numbersBjörn-Egil Dahlberg
2010-09-14Update version numbersBjörn Gustavsson
2010-06-18Update Erlang system version to R14BBjörn-Egil Dahlberg
2010-02-24Update version for R14ARickard Green
2009-11-25Update version numbersRickard Green
2009-11-20The R13B03 release.OTP_R13B03Erlang/OTP