Merge branch 'slatez-applets'
authorJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Tue, 20 Oct 2009 13:00:51 +0000 (14:00 +0100)
Conflicts:
Makefile.am
configure.ac

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
@@@ -8,10 -4,10 +4,6 @@@ if HAVE_NS
  SUBDIRS += nautilus-sendto-plugin
  endif
  
- if HAVE_NOTHERE
- SUBDIRS += nothere
 -if HAVE_PYTHON
 -SUBDIRS += python
--endif
--
  if HAVE_TESTS
  SUBDIRS += tests
  endif
diff --cc configure.ac
@@@ -523,7 -501,6 +463,5 @@@ Configure summary
  
      Extras:
        Documentation...............:  ${enable_gtk_doc}
-       Megaphone applet............:  ${have_megaphone}
-       Nothere applet..............:  ${have_nothere}
 -      Python bindings.............:  ${have_python}
        Nautilus-sendto plugin......:  ${have_nst}
  "