diff options
| author | Henrik Nord <henrik@erlang.org> | 2011-09-20 11:19:21 +0200 |
|---|---|---|
| committer | Henrik Nord <henrik@erlang.org> | 2011-09-20 11:19:21 +0200 |
| commit | ec36499d7e329b4dc69a1a3be3422eac7907c260 (patch) | |
| tree | 3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/ic | |
| parent | 532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff) | |
| parent | 53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff) | |
| download | erlang-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz | |
Merge branch 'dev' into major
Conflicts:
erts/aclocal.m4
erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/ic')
| -rw-r--r-- | lib/ic/src/ic.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl index 3c6ce3d9d6..e22179fe42 100644 --- a/lib/ic/src/ic.erl +++ b/lib/ic/src/ic.erl @@ -320,7 +320,7 @@ pragma(G, File, T) -> time, time("pragma registration ", ic_pragma, pragma_reg, [G,T]), ic_pragma:pragma_reg(G,T)) of - %% All pragmas were succesfully applied + %% All pragmas were successfully applied {ok,Clean} -> typing(G, File, Clean); |