argh.  100 lashes for me.  as soon as I figure out how, I'll back out this
conflict.....


On Fri, 1 Sep 2000, Dan McMahill wrote:

> 
> Module Name:	pkgsrc
> Committed By:	dmcmahill
> Date:		Thu Aug 31 22:24:04 UTC 2000
> 
> Update of /cvsroot/pkgsrc/x11/wxGTK
> In directory netbsd.hut.fi:/tmp/cvs-serv22358
> 
> Log Message:
> initial import of wxGTK-2.2.1
> 
> wxGTK is the GTK based version of wxWindows.
> 
> wxWindows is a free C++ library for cross-platform GUI development.
> 
> This lets you create native applications for different operating systems
> from the same source code. 
> 
> wxWindows is currently merging libraries based on GTK+, Windows, Motif
> and Mac with OS/2 started. 
> 
> Status:
> 
> Vendor Tag:	TNF
> Release Tags:	pkgsrc-base
> 		
> U pkgsrc/x11/wxGTK/Makefile
> U pkgsrc/x11/wxGTK/pkg/PLIST
> U pkgsrc/x11/wxGTK/pkg/COMMENT
> U pkgsrc/x11/wxGTK/pkg/DESCR
> U pkgsrc/x11/wxGTK/files/md5
> C pkgsrc/x11/wxGTK/files/patch-sum
> U pkgsrc/x11/wxGTK/patches/patch-aa
> U pkgsrc/x11/wxGTK/patches/patch-ab
> U pkgsrc/x11/wxGTK/patches/patch-ac
> 
> 1 conflicts created by this import.
> Use the following command to help the merge:
> 
> 	cvs checkout -jTNF:yesterday -jTNF pkgsrc/x11/wxGTK
>