From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Sun, 23 Dec 2007 14:25:40 +0000 (+0000)
Subject: Merge branch 'ignore'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=9bf05e63eee22adbe6415c4d5c3ae272e8370da3

Merge branch 'ignore'

svn path=/trunk/; revision=497
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..26783426
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+*.[oa]
+*.lo
+*.la
+Makefile.in
+Makefile
+.deps
+.libs
+*.swp
+*enum-types*
+*.pc
+*.tar.*
+*.orig
+*.rej
+*.bak
+
+ChangeLog
+stamp-h1
+xmldocs.make
+INSTALL
+aclocal.m4
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+autom4te.cache
+gtk-doc.make
+install-sh
+intltool-*
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+omf.make
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 00000000..fd8659a1
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,3 @@
+empathy.desktop
+empathy.desktop.in
+empathy.schemas
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..a7316fb1
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,8 @@
+html
+xml
+tmpl
+*.txt
+*.stamp
+
+version.xml
+
diff --git a/docs/libempathy-gtk/.gitignore b/docs/libempathy-gtk/.gitignore
new file mode 100644
index 00000000..51f58163
--- /dev/null
+++ b/docs/libempathy-gtk/.gitignore
@@ -0,0 +1,6 @@
+libempathy-gtk.args
+libempathy-gtk.hierarchy
+libempathy-gtk.interfaces
+libempathy-gtk.prerequisites
+libempathy-gtk.signals
+
diff --git a/docs/libempathy/.gitignore b/docs/libempathy/.gitignore
new file mode 100644
index 00000000..0a5b4cab
--- /dev/null
+++ b/docs/libempathy/.gitignore
@@ -0,0 +1,6 @@
+libempathy.args
+libempathy.hierarchy
+libempathy.interfaces
+libempathy.prerequisites
+libempathy.signals
+
diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore
new file mode 100644
index 00000000..a3a15a1a
--- /dev/null
+++ b/libempathy-gtk/.gitignore
@@ -0,0 +1 @@
+*.gladep
diff --git a/libempathy/.gitignore b/libempathy/.gitignore
new file mode 100644
index 00000000..8617dcbd
--- /dev/null
+++ b/libempathy/.gitignore
@@ -0,0 +1,4 @@
+empathy-chandler-glue.h
+empathy-marshal.*
+empathy-filter-glue.h
+tp-stream-engine-gen.h
diff --git a/megaphone/.gitignore b/megaphone/.gitignore
new file mode 100644
index 00000000..697575ef
--- /dev/null
+++ b/megaphone/.gitignore
@@ -0,0 +1,4 @@
+GNOME_Megaphone_Applet.schemas
+GNOME_Megaphone_Applet.server
+GNOME_Megaphone_Applet.server.in
+megaphone-applet
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 00000000..c7d5b984
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,5 @@
+*.gmo
+.intltool-merge-cache
+Makefile.in.in
+POTFILES
+stamp-it
diff --git a/python/.gitignore b/python/.gitignore
new file mode 100644
index 00000000..19cea19b
--- /dev/null
+++ b/python/.gitignore
@@ -0,0 +1,2 @@
+pyempathy.c
+pyempathygtk.c
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..75a62869
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,4 @@
+empathy
+empathy-accounts
+empathy-chat-chandler
+org.gnome.Empathy.Chat.service