merge git work

[empathy.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1fdf7e79f0fc095926b1342b15afd1cc26b388b1..267834268a946985e0df6d9b36d3b2fb8959cc6c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,14 +5,13 @@ Makefile.in
 Makefile
 .deps
 .libs
-*.sw[po]
+*.swp
 *enum-types*
 *.pc
 *.tar.*
 *.orig
 *.rej
 *.bak
-*~
 
 ChangeLog
 stamp-h1
@@ -24,7 +23,6 @@ config.h
 config.h.in
 config.log
 config.status
-config.status.lineno
 config.sub
 configure
 depcomp
@@ -37,4 +35,3 @@ ltmain.sh
 missing
 mkinstalldirs
 omf.make
-compile