From b8607414ea0e41c44a09d31ebcd0437a3c867a24 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Sat, 29 Dec 2007 15:49:47 +0000
Subject: merge git work

svn path=/trunk/; revision=518
---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 1fdf7e79f..267834268 100644
--- 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
-- 
cgit v1.2.3