aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-18 03:28:02 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:46:31 +0000
commit94908a759619afa5518abd5c37b1489d8089f8a9 (patch)
tree99c1dc9207ac6de15d2446015c0bc76f3a32b860 /.gitignore
parent7d2876023f9825f0dc743a6841c1d91e083a5afa (diff)
downloadlibmatchboxwm2-94908a759619afa5518abd5c37b1489d8089f8a9.tar.gz
libmatchboxwm2-94908a759619afa5518abd5c37b1489d8089f8a9.tar.bz2
libmatchboxwm2-94908a759619afa5518abd5c37b1489d8089f8a9.zip
Adds some more files to .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore63
1 files changed, 63 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d638e0f..8604c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
.gitignore
Makefile.in
Makefile
@@ -10,20 +11,82 @@ autom4te.cache
*.o
*~
confdefs.h
+=======
+*.la
+*.lo
+*.o
+*.swo
+*.swp
+Makefile.in
+Makefile
+.deps
+.libs
+COPYING
+INSTALL
+aclocal.m4
+autom4te.cache
+>>>>>>> Adds an initial .gitignore file
config.guess
config.log
config.status
config.sub
configure
+<<<<<<< HEAD
matchbox/managers/simple/matchbox-window-manager-2-simple
matchbox/mb-wm-config.h
+=======
+>>>>>>> Adds an initial .gitignore file
depcomp
install-sh
libtool
ltmain.sh
missing
+<<<<<<< HEAD
*.orig
*.rej
aclocal.m4
COPYING
INSTALL
+=======
+gtk-doc.make
+tags
+matchbox-2.0.pc
+matchbox/mb-wm-config.h
+doc/reference/matchbox/html-build.stamp
+doc/reference/matchbox/html.stamp
+doc/reference/matchbox/html/
+doc/reference/matchbox/matchbox-decl-list.txt
+doc/reference/matchbox/matchbox-decl.txt
+doc/reference/matchbox/matchbox-docs.sgml
+doc/reference/matchbox/matchbox-overrides.txt
+doc/reference/matchbox/matchbox-sections.txt
+doc/reference/matchbox/matchbox-undeclared.txt
+doc/reference/matchbox/matchbox-undocumented.txt
+doc/reference/matchbox/matchbox-unused.txt
+doc/reference/matchbox/matchbox.args
+doc/reference/matchbox/matchbox.hierarchy
+doc/reference/matchbox/matchbox.interfaces
+doc/reference/matchbox/matchbox.prerequisites
+doc/reference/matchbox/matchbox.signals
+doc/reference/matchbox/matchbox.types
+doc/reference/matchbox/matchbox2-decl-list.txt
+doc/reference/matchbox/matchbox2-decl-list.txt.bak
+doc/reference/matchbox/matchbox2-decl.txt
+doc/reference/matchbox/matchbox2-decl.txt.bak
+doc/reference/matchbox/matchbox2-overrides.txt
+doc/reference/matchbox/matchbox2-undeclared.txt
+doc/reference/matchbox/matchbox2-undocumented.txt
+doc/reference/matchbox/matchbox2-unused.txt
+doc/reference/matchbox/matchbox2.args
+doc/reference/matchbox/matchbox2.hierarchy
+doc/reference/matchbox/matchbox2.interfaces
+doc/reference/matchbox/matchbox2.prerequisites
+doc/reference/matchbox/matchbox2.signals
+doc/reference/matchbox/scan-build.stamp
+doc/reference/matchbox/sgml-build.stamp
+doc/reference/matchbox/sgml.stamp
+doc/reference/matchbox/version.xml
+doc/reference/matchbox/xml/
+managers/maemo/matchbox-window-manager-2-maemo
+managers/simple/matchbox-window-manager-2-simple
+>>>>>>> Adds an initial .gitignore file