summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-12-29 15:58:47 (GMT)
committerXavier Claessens <xclaesse@src.gnome.org>2007-12-29 15:58:47 (GMT)
commite4358acdec7b8c278a1950a3da24bab387a0e7b3 (patch)
tree9a15f253d9c45a90a8794143ecdd854650d58af1 /.gitignore
parentb8607414ea0e41c44a09d31ebcd0437a3c867a24 (diff)
downloadempathy-e4358acdec7b8c278a1950a3da24bab387a0e7b3.tar.gz
empathy-e4358acdec7b8c278a1950a3da24bab387a0e7b3.tar.xz
Revert "merge git work"
This reverts commit 0cfd80847f0d66967f56c7d6b3eb46793f725859. svn path=/trunk/; revision=519
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2678342..1fdf7e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,14 @@ Makefile.in
Makefile
.deps
.libs
-*.swp
+*.sw[po]
*enum-types*
*.pc
*.tar.*
*.orig
*.rej
*.bak
+*~
ChangeLog
stamp-h1
@@ -23,6 +24,7 @@ config.h
config.h.in
config.log
config.status
+config.status.lineno
config.sub
configure
depcomp
@@ -35,3 +37,4 @@ ltmain.sh
missing
mkinstalldirs
omf.make
+compile