diff options
| author | Lukas Larsson <[email protected]> | 2013-06-05 16:04:38 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-06-05 16:04:38 +0200 |
| commit | a617d1665e33c2a622fe1f426566a40cd2c6556e (patch) | |
| tree | 3914ba0e3fb2e7743531705a30af9521968d516f /.gitattributes | |
| parent | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (diff) | |
| parent | 5968b8e07453c8a34d4fe2c4a57f66d3ecb6c628 (diff) | |
| download | otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.tar.gz otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.tar.bz2 otp-a617d1665e33c2a622fe1f426566a40cd2c6556e.zip | |
Merge branch 'maint'
* maint:
erts: Update spec in preloaded to reflect sucess typing
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions