diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-27 07:52:07 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-27 07:52:07 +0200 |
| commit | 0e132c07e92835811e01bec415399916afc3e44d (patch) | |
| tree | 3a5543416144a4b57263ad259ef809104e18bdf0 /EPLICENCE | |
| parent | 1eb09dda09fa3de6b05f09d881065a0a7de2624f (diff) | |
| parent | e423e12e8ad87348ca6c583b0ebdbe5de2aefc6f (diff) | |
| download | otp-0e132c07e92835811e01bec415399916afc3e44d.tar.gz otp-0e132c07e92835811e01bec415399916afc3e44d.tar.bz2 otp-0e132c07e92835811e01bec415399916afc3e44d.zip | |
Merge branch 'dev' into major
* dev:
Update preloaded modules
erl_prim_loader: Eliminate dialyzer warning
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to 'EPLICENCE')
0 files changed, 0 insertions, 0 deletions