Am 2019-01-05 19:24, schrieb John Beard:
On Sat, Jan 5, 2019 at 4:23 PM Seth Hillbrand <[email protected]>
wrote:
Patch 0002 does not apply cleanly to qa/CMakeLists.txt even after
applying 0001
Hmm, that's odd: I can apply this with "git am 0002....". I'm applying
on top of 69fc301bf. Where are you applying it to? Do you still have
the triangulation test code in your tree? IIRC there is a conflict in
that file.
Very odd. I ended up doing a 3way merge and hand-editing the result.
Please check that I didn't mix anything up. The conflict was (I think)
an extra line in qa/CMakeLists.txt.
The tests and patch seems to work as expected. Thanks!
-S
_______________________________________________
Mailing list: https://launchpad.net/~kicad-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~kicad-developers
More help : https://help.launchpad.net/ListHelp
