diff options
| author | Björn Gustavsson <[email protected]> | 2012-06-25 15:37:43 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-06-25 15:37:43 +0200 |
| commit | 2af66d1761c54e0bc2811a2ad2950f62d9ceccdc (patch) | |
| tree | 8462176f1ed1ea898cd9a6681c855aea7046e7d6 /bootstrap/bin | |
| parent | b81fcd916e10ca10f3e65c02f005bfe770275dce (diff) | |
| parent | 5a12a0605b06a4971f7005b26f6591de9c69837d (diff) | |
| download | otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.tar.gz otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.tar.bz2 otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
sys_pre_expand: Eliminate bottleneck for modules with many functions
Conflicts:
bootstrap/bin/start.boot
bootstrap/bin/start_clean.boot
bootstrap/lib/kernel/ebin/file.beam
bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
Diffstat (limited to 'bootstrap/bin')
| -rw-r--r-- | bootstrap/bin/start.boot | bin | 5306 -> 5248 bytes |
| -rw-r--r-- | bootstrap/bin/start_clean.boot | bin | 5306 -> 5248 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot Binary files differindex 6d62af557e..c6ebc852a2 100644 --- a/bootstrap/bin/start.boot +++ b/bootstrap/bin/start.boot diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot Binary files differindex 6d62af557e..c6ebc852a2 100644 --- a/bootstrap/bin/start_clean.boot +++ b/bootstrap/bin/start_clean.boot |