diff options
-rw-r--r-- | .gitignore | 63 |
1 files changed, 63 insertions, 0 deletions
@@ -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 |