<<<<<<< HEAD
*.o
*.lo
*.loT
*.a
*.mo
*.la
*~
*.stamp
*.bak
*.tmp
*.rej
.tm*
~*
*.tar.gz


/INSTALL
/Makefile
/Makefile.in
/aclocal.m4
/autom4te.cache
/compile
/config.*
/configure
/depcomp
/gnome-doc-utils.make
/install-sh
/intltool-*
/junk
=======
*.a
*.o
*.gmo
*.la
*.lo
*.mo

Makefile.in
Makefile
.deps
.libs

/aclocal.m4
/autom4te.cache
/config.h
/config.h.in
/config.guess
/config.log
/config.status
/config.sub
/configure
/depcomp
/gnome-doc-utils.make
/intltool-extract.in
/intltool-merge.in
/intltool-update.in
/install-sh
/INSTALL
>>>>>>> Build and repo fixes.
/libtool
/ltmain.sh
/missing
/mkinstalldirs
<<<<<<< HEAD
/seahorse-?.?.?
/seahorse.spec
/seahorse.p*
/stamp*

# Eclipse project files
/.*project
/.settings

# Anjuta project files
/*.anjuta
/*.tasks
/*.pws
/*.prj
=======
/m4/*.m4
/stamp*

/agent/seahorse-agent
/data/seahorse-plugins.schemas

/libseahorse/seahorse-marshal.?

/help/*/seahorse-plugins.xml
/help/seahorse-plugins-*.omf
/plugins/applet/GNOME_SeahorseApplet.server
/plugins/applet/GNOME_SeahorseApplet.server.in
/plugins/applet/docs/*/seahorse-applet.xml
/plugins/applet/docs/seahorse-applet-*.omf
/plugins/applet/seahorse-applet
/plugins/gedit/seahorse-gedit.schemas
/plugins/gedit/seahorse-pgp.gedit-plugin
/plugins/nautilus/seahorse-pgp-encrypted.desktop
/plugins/nautilus/seahorse-pgp-encrypted.desktop.in
/plugins/nautilus/seahorse-pgp-keys.desktop
/plugins/nautilus/seahorse-pgp-keys.desktop.in
/plugins/nautilus/seahorse-pgp-preferences.desktop
/plugins/nautilus/seahorse-pgp-signature.desktop
/plugins/nautilus/seahorse-pgp-signature.desktop.in
/plugins/nautilus/seahorse-preferences
/plugins/nautilus/seahorse-tool

/po/Makefile.in.in
/po/POTFILES
/po/stamp-it
/po/.intltool-merge-cache

>>>>>>> Build and repo fixes.
