diff options
| author | Siri Hansen <[email protected]> | 2012-08-08 17:18:33 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-08-08 17:18:33 +0200 |
| commit | a3a36a8a69ac3026904379e7d21e909477ad3309 (patch) | |
| tree | 969af41ba3c52bbe415e12551c1d02f7071fb7d8 /.mailmap | |
| parent | 509d798a2f4e70fe3c0d467903481ae3c3d612a9 (diff) | |
| parent | 2c799b1c86308246a0aca04d92f301d45509b951 (diff) | |
| download | otp-a3a36a8a69ac3026904379e7d21e909477ad3309.tar.gz otp-a3a36a8a69ac3026904379e7d21e909477ad3309.tar.bz2 otp-a3a36a8a69ac3026904379e7d21e909477ad3309.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions