summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-01-23 16:21:14 +0100
committerHans de Goede <hdegoede@redhat.com>2012-01-23 16:21:14 +0100
commit2f4115e52eeea3039a9e230d8c79ab42691a7dbf (patch)
tree3b5337f7baa7fcbf54c044171ecf705c7c077efd /.gitignore
parentc05523462f2c63bfedf183d9fee6debbce6b6ac0 (diff)
parent8817549795722026ca83edab2640b8f156510074 (diff)
downloadspice-2f4115e52eeea3039a9e230d8c79ab42691a7dbf.tar.gz
spice-2f4115e52eeea3039a9e230d8c79ab42691a7dbf.tar.xz
spice-2f4115e52eeea3039a9e230d8c79ab42691a7dbf.zip
Merge remote-tracking branch 'origin/master' into 0.100.10.1
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5a4db5ca..6c15c135 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,9 @@ depcomp
install-sh
libtool
ltmain.sh
+m4/
missing
Makefile
Makefile.in
+spice-server.pc
stamp-h1