On Thu, May 26, 2011 at 15:03, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Ãvar ArnfjÃrà Bjarmason venit, vidit, dixit 26.05.2011 01:33: >> On Wed, May 25, 2011 at 11:55, Michael J Gruber >> <git@xxxxxxxxxxxxxxxxxxxx> wrote: >> >> I suppose it was inevitable that we'd end up maintaining this since >> upstream only maintains the GPLv3 version now. >> >>>  /* Default values for command line options. Â*/ >>> - Âunsigned short int show_variables = 0; >>> + Â/* unsigned short int show_variables = 0; */ >> >>> -     show_variables = 1; >>> +     /* show_variables = 1; */ >> >> Can we just remove these lines instead of commenting them out? > > Sure, I just didn't know what is more convenient for the maintainer. I > noticed a few comments in there already but have not compared with > upstream. Resend necessary? No it's fine. But I/we are the upstream for this program now, since GNU only maintains the GPLv3 version. We could just use that actually, since this is a stand-alone program. Or do we have intrinsic objections to GPLv3 code in our source tree? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html