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

[Zachary McGrew]

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

    gdl: version bump to
---
 devel/gdl/DETAILS |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/devel/gdl/DETAILS b/devel/gdl/DETAILS
index 6fb5551..ed36351 100644
--- a/devel/gdl/DETAILS
+++ b/devel/gdl/DETAILS
@@ -1,4 +1,5 @@
           MODULE=gdl
+<<<<<<< Updated upstream
          VERSION=2.26.2
            MAJOR=2.26
           SOURCE=$MODULE-$VERSION.tar.bz2
@@ -7,6 +8,16 @@
         WEB_SITE=http://www.gnome.org/
          ENTERED=20060423
          UPDATED=20090526
+=======
+         VERSION=2.30.0
+           MAJOR=2.30
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
+      SOURCE_VFY=sha1:3047e8646552947174b8aa02470dc5b43c208e83
+        WEB_SITE=http://www.gnome.org/
+         ENTERED=20060423
+         UPDATED=20100404
+>>>>>>> Stashed changes
            SHORT="GNOME Development Libraries"
 
 cat << EOF