From 17b31427765d21591986b927955f6f5342201d82 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 21 May 2007 10:47:28 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts:

	configure.ac
---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 520ad93..00e76ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ PKG_CHECK_MODULES(SHELL, gtk+-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10)
 PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFSDIR)
 
-#
 # Setup GETTEXT
 #
 ALL_LINGUAS="it ha ig yo"
--
cgit v0.9.1