diff options
| author | Micael Karlberg <bmk@erlang.org> | 2011-03-25 21:19:05 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2011-03-25 21:19:05 +0100 |
| commit | 5396cae69c23d7d8b7bbd0433c3b31144254c7a9 (patch) | |
| tree | a16e52267f14417155e938ee5f34cc5082efc314 /.gitignore | |
| parent | 143cc965e88ea2486c1e6b804f2ae033e870de2d (diff) | |
| parent | f0e2f0b91ac4d45a64ddac511e0eba9b6ce01e92 (diff) | |
| download | otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.tar.gz otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.tar.bz2 otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0bd5e1ff2c..409be555fb 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ make/win32/ /lib/*/test/*_SUITE_make.erl /lib/*/test/*_SUITE_data/Makefile /erts/emulator/test/*_SUITE_make.erl +/erts/emulator/test/*_native_SUITE.erl /erts/emulator/test/*_SUITE_data/Makefile /erts/test/install_SUITE_data/install_bin /erts/test/autoimport_SUITE_data/erlang.xml |