diff options
| author | Guillaume Desmottes <gdesmott@gnome.org> | 2008-01-25 05:23:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <gdesmott@gnome.org> | 2008-01-25 05:23:09 +0800 |
| commit | e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9 (patch) | |
| tree | 7523f8ac52a5fd7b958d55f9f6533c6add0ace11 /tests | |
| parent | 915e5f6d71da5ce14b2462f2db850c90be7546bf (diff) | |
| parent | ec3abba0aee010621b096c854851938d9501b3fd (diff) | |
| download | gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar.gz gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar.bz2 gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar.lz gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar.xz gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.tar.zst gsoc2013-empathy-e1a2ac951fec7ef11aaeaf3da6b62c036b2be7e9.zip | |
Merge branch 'master' into irc
Conflicts:
docs/libempathy/libempathy-docs.sgml
docs/libempathy/libempathy.types
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index f8fe003d5..9eb54132f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,7 @@ LDADD = \ $(top_builddir)/libempathy/libempathy.la \ $(EMPATHY_LIBS) -bin_PROGRAMS = \ +noinst_PROGRAMS = \ contact-manager contact_manager_SOURCES = contact-manager.c |