On Nov 12, 2012, at 5:01 PM, Arnaud Quette wrote: > Hi Charles > > 2012/11/12 Charles Lepple <[email protected]> > On Nov 12, 2012, at 8:51 AM, Charles Lepple wrote: > >> and the unrelated change that reverses r3757 (or is that what Arnaud was >> referring to with the conflict in r3767?) > > > sorry, that was the result of a typo in my diff command. r3757 just hasn't > been merged with the libnutclient branch. > > just to be sure: is it alright with the merge?
Yes. I committed it as r3776. -- Charles Lepple clepple@gmail
_______________________________________________ Nut-upsdev mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/nut-upsdev
