[gnome-clocks/wip/mallard-help: 176/176] Merge branch 'wip/mallard-help'

[Aruna Sankaranarayanan <arunasank src gnome org>]

commit 025f91f0aadb7542e88692a7266bdee872f44252
Merge: 409dd20 5771d53
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Sun Sep 8 19:45:05 2013 +0530

    Merge branch 'wip/mallard-help'
    
    Fix conflicts in
        Makefile.am
        configure.ac

 configure.ac |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc configure.ac
index 7be55b4,24b1f02..4249536
--- a/configure.ac
+++ b/configure.ac
@@@ -58,8 -56,15 +58,10 @@@ PKG_CHECK_MODULES(CLOCKS, 
      libnotify >= 0.7.0
  ])
  
 -LIBGD_INIT([
 -    static
 -    header-bar
 -    stack
 -    vapi
 -])
 +YELP_HELP_INIT
  
+ YELP_HELP_INIT
+ 
  AC_CONFIG_FILES([
      Makefile
      help/Makefile