[Lunar-commits] <moonbase> intltool: version bump to

[Zachary McGrew]

commit 3b86c83f075304e27f737825d5b903da60af3b92
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Mon Apr 5 13:36:48 2010 -0700

    intltool: version bump to
---
 doc-tools/intltool/DETAILS |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/doc-tools/intltool/DETAILS b/doc-tools/intltool/DETAILS
index 3024144..189220f 100644
--- a/doc-tools/intltool/DETAILS
+++ b/doc-tools/intltool/DETAILS
@@ -1,4 +1,5 @@
           MODULE=intltool
+<<<<<<< Updated upstream
          VERSION=0.40.6
            MAJOR=0.40
           SOURCE=$MODULE-$VERSION.tar.bz2
@@ -7,6 +8,15 @@
         WEB_SITE=http://freedesktop.org/wiki/Software/intltool
          ENTERED=20010922
          UPDATED=20090318
+=======
+         VERSION=0.41.1
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://edge.launchpad.net/$MODULE/trunk/$VERSION/+download/
+      SOURCE_VFY=sha1:20b2bf222395cf1711fee1f1b7b7650b9e0f2fc2
+        WEB_SITE=http://freedesktop.org/wiki/Software/intltool
+         ENTERED=20010922
+         UPDATED=20100405
+>>>>>>> Stashed changes
            SHORT="xml internationalization tools"
 
 cat << EOF