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

This reverts commit 0cfd80847f0d66967f56c7d6b3eb46793f725859.

svn path=/trunk/; revision=519
---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 26783426..1fdf7e79 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
-- 
cgit v1.2.1