[sane-devel] Re: Hungry CVS: cvs : external/sane/sane-backends/backend Makefile.in
Tue, 11 Sep 2001 06:37:48 -0500
Sorry about that. No there wasn't any conflict when committing (unless
I didn't know how to recognize one??) I didn't do anything different
when committing this file than I did for any of the others.
On Tue, Sep 11, 2001 at 12:40:45PM +0200, Henning Meier-Geinitz wrote:
> On Mon, Sep 10, 2001 at 04:10:48PM -0700, CVS User wrote:
> > cvs 2001/09/10 16:10:45 PDT
> > Modified files:
> > sane/sane-backends/backend Makefile.in
> > Log:
> > Disable gphoto2 backend if gphoto2 binary is not found
> > Revision Changes Path
> > 1.21 +5 -4 external/sane/sane-backends/backend/Makefile.in
> Hey, be careful! You removed mustek_usb from the list of backends.
> Wasn't there a conflict when comitting? I have added mustek_usb again
> in CVS.
> Sane-devel mailing list