X-Authentication-Warning: kendall.sfbr.org: jeffw set sender to jeffw AT darwin DOT sfbr DOT org using -f
Date: Mon, 29 Jan 2001 07:35:43 -0600
From: JT Williams <jeffw AT darwin DOT sfbr DOT org>
To: djgpp-workers AT delorie DOT com
Subject: Re: djasm patch
Message-ID: <20010129073543.A27745@kendall.sfbr.org>
Mail-Followup-To: djgpp-workers AT delorie DOT com
References: <20010126121906 DOT A9266 AT taniwha DOT org> <Pine DOT LNX DOT 4 DOT 10 DOT 10101291347280 DOT 27309-100000 AT acp3bf>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <Pine.LNX.4.10.10101291347280.27309-100000@acp3bf>; from broeker@physik.rwth-aachen.de on Mon, Jan 29, 2001 at 01:50:21PM +0100
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

-: Hmm.... looks like it's time for you or someone else to do a 'threeway'
-: diff or merge: your version, the current CVS version, and their common
-: ancestor.

It's really not that bad; just some initial confusion on my part.
Bill's patches for enums, additional instructions, etc, apply cleanly
to the official djasm.y.  And Bill is only missing a couple of very
small patches made by Eli and Martin.