diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-28 13:47:47 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-28 13:47:47 +0100 |
| commit | 3bcf603c4790768d60f57fb2fdfb8efa47dad9a3 (patch) | |
| tree | ee6c334352205dba71e31eb3f9ecd7a29a0dea8f /erts/emulator/test/Makefile | |
| parent | 4fee3925d969a42088af74dd02a791bb8e27fd9b (diff) | |
| parent | 8abce7f45cd032bb20f004701e13cf641d32fef7 (diff) | |
| download | otp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.tar.gz otp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.tar.bz2 otp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.zip | |
Merge branch 'bjorn/major-release-cleanups'
* bjorn/major-release-cleanups:
observer tests: Test compatibility with R13, not R12
emulator tests: Test compatibility with R13, not R12
Teach the compiler the 'r14' option
erl_lint: The types introduced in R12B-5 are no longer "newly introduced"
otp_internal: Stop warning for functions removed in R12 or earlier
Conflicts:
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'erts/emulator/test/Makefile')
| -rw-r--r-- | erts/emulator/test/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index 4d0c87bf12..08d2066da3 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -61,7 +61,7 @@ MODULES= \ exception_SUITE \ float_SUITE \ fun_SUITE \ - fun_r12_SUITE \ + fun_r13_SUITE \ gc_SUITE \ guard_SUITE \ hash_SUITE \ |