diff options
| author | jschauma <jschauma> | 2003-06-02 03:14:50 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-06-02 03:14:50 +0000 |
| commit | b356cf44583ef22c2b67b81184ca0ed741f550ad (patch) | |
| tree | 3cf88d573578ad2b69a36d3935d74fb95f0d4675 /graphics | |
| parent | e4265b310856834018287a415c6ccfa4a335a54a (diff) | |
| download | pkgsrc-b356cf44583ef22c2b67b81184ca0ed741f550ad.tar.gz | |
Resolve conflicts from last commit.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gtkglext/Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 89c93ef73c5..58eb2551e9e 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,16 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2003/06/02 01:19:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2003/06/02 03:14:50 jschauma Exp $ # -<<<<<<< Makefile -DISTNAME= gtkglext-0.6.1 -PKGREVISION= 1 -======= DISTNAME= gtkglext-0.7.1 -<<<<<<< Makefile ->>>>>>> 1.5 -======= -PKGREVISION= 1 ->>>>>>> 1.6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/} EXTRACT_SUFX= .tar.bz2 |