kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

Thanks for the info.  I had just attempted to merger Werner's patch and
got the same error message and I did notice the difference.  I'll try
merging using the full email when I get a chance.

On 9/13/2016 8:37 PM, Chris Pavlina wrote:
> He used 'git send-email', which also gives 'git am'-compatible patches.
> You can merge this the same as usual, but you have to save the entire
> email and then pass that to 'git am'. I just tested it, works fine.
> 
> On Tue, Sep 13, 2016 at 07:45:35PM -0400, Wayne Stambaugh wrote:
>> Jose,
>>
>> Please use `git format-patch` for submitting patches.  It makes it
>> easier for me to merger your patches.
>>
>> Thanks,
>>
>> Wayne
>>
>> On 9/8/2016 2:59 PM, José Ignacio Romero wrote:
>>>
>>> It is ON by default, determines wether to install the bundled demos
>>> and examples.
>>> ---
>>>
>>> This version has the required documentation changes.
>>>
>>> ---
>>>  CMakeLists.txt                         | 6 ++++++
>>>  Documentation/development/compiling.md | 7 +++++++
>>>  2 files changed, 13 insertions(+)
>>>
>>>
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~kicad-developers
>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp