diff options
| author | Sverker Eriksson <[email protected]> | 2013-06-20 15:17:46 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-06-20 15:17:46 +0200 |
| commit | 534f6c34f9f133d462b4e463b356be7f2188dc0a (patch) | |
| tree | b8f545fe6460cc7a07801ea2964299d105b91b37 /.mailmap | |
| parent | 2b2646d97a0f2248d7ec1be81fb88488cfec9a56 (diff) | |
| parent | 6898b6285f443e9ad8d01ce17b08bb7991c6ea5f (diff) | |
| download | otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.tar.gz otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.tar.bz2 otp-534f6c34f9f133d462b4e463b356be7f2188dc0a.zip | |
Merge branch 'maint'
Conflicts:
erts/vsn.mk
lib/kernel/vsn.mk
lib/stdlib/vsn.mk
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions