diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-19 15:11:16 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-19 15:11:16 +0200 |
| commit | 70fa7fabed2fb4f47155f02a1c8fa4054a546739 (patch) | |
| tree | 7d755f622e3568f78fad2da4409725d3a13f11b8 /erts | |
| parent | bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d (diff) | |
| parent | 692772c8e238d66eb054faba5dd0fba4bacf3a2f (diff) | |
| download | otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.tar.gz otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.tar.bz2 otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.zip | |
Merge branch 'dev' into major
* dev:
tar_SUITE: Work around limited pathname length on Windows
Merge the fourth bootstrap stage into the third bootstrap stage
Remove unused lib/orber/include/Makefile
Remove lib/orber/include/* from the primary bootstrap
otp_build update_primary: Don't commit generated source files
primary bootstrap: Remove source files
Conflicts:
Makefile.in
bootstrap/bin/start.script
bootstrap/bin/start_clean.script
bootstrap/lib/compiler/ebin/compiler.app
bootstrap/lib/compiler/egen/beam_opcodes.erl
bootstrap/lib/compiler/egen/core_parse.erl
bootstrap/lib/kernel/ebin/kernel.app
bootstrap/lib/kernel/ebin/kernel.appup
bootstrap/lib/orber/include/Makefile
bootstrap/lib/orber/include/corba.hrl
bootstrap/lib/orber/include/orber_pi.hrl
bootstrap/lib/stdlib/ebin/stdlib.app
bootstrap/lib/stdlib/ebin/stdlib.appup
bootstrap/lib/stdlib/egen/erl_parse.erl
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions