diff options
| author | Lukas Larsson <[email protected]> | 2013-12-02 11:21:21 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-12-02 11:21:21 +0100 |
| commit | 22f1c2d08701038b52099dc09b52e5b94a6f8fba (patch) | |
| tree | 762ab42e81894a05b2050aa81f9ab177151c3844 /.gitattributes | |
| parent | c3d9d667e028284d6f96f8e260d094f1775182ea (diff) | |
| parent | 301a7c2de81559fce4ab504afe5db68744a7c6d7 (diff) | |
| download | otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.tar.gz otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.tar.bz2 otp-22f1c2d08701038b52099dc09b52e5b94a6f8fba.zip | |
Merge branch 'maint'
* maint:
erts: Fix naming in erlang:monitor spec
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions