diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-12-20 12:28:36 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2010-12-20 12:28:36 +0100 |
| commit | 1e64afef9bc131d2ca5b8a43d2eb63bb7120dc80 (patch) | |
| tree | befdde83f8d84ad40229c767aa394070cbe73bca | |
| parent | 1de445e76dee4e9473eadf7f6bd0dcb26a295a64 (diff) | |
| parent | 64e1ea2c076f4e858d3938fca83f4bf7732df575 (diff) | |
| download | otp-1e64afef9bc131d2ca5b8a43d2eb63bb7120dc80.tar.gz otp-1e64afef9bc131d2ca5b8a43d2eb63bb7120dc80.tar.bz2 otp-1e64afef9bc131d2ca5b8a43d2eb63bb7120dc80.zip | |
Merge branch 'egil/fix-gitignore-vim' into dev
* egil/fix-gitignore-vim:
Fix .gitignore
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d67116d6e3..54bfadea9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ # Match at any level. + +# emacs *~ +# vim +.*.sw[a-z] + autom4te.cache *.beam *.asn1db @@ -162,6 +167,7 @@ make/win32/ /erts/emulator/test/*_SUITE_make.erl /erts/emulator/test/*_SUITE_data/Makefile /erts/test/install_SUITE_data/install_bin +/erts/test/autoimport_SUITE_data/erlang.xml # asn1 |