I looked over the patch and I *think* the auto-merge will do fine on it. (Most of my changes were on the layers side of things, while most of Jon’s are on the render side.)
> On 22 Feb 2018, at 13:11, Wayne Stambaugh <stambau...@gmail.com> wrote: > > Jon, > > I'm fine with the rearranging but I think Jeff is doing some work on the > layer manager. You might want to coordinate with him to make sure you > don't end up with a big merge clash. > > Cheers, > > Wayne > > On 2/21/2018 11:39 PM, Jon Evans wrote: >> Hi all, >> >> This patch rearranges the Render panel to be in a more logical order, >> and adds some whitespace. >> I divided it into three groupings: >> 1) footprint related >> 2) other board objects >> 3) non-board stuff like grid, ratlines, etc. >> >> I also bumped out the default size so that scrollbars aren't needed by >> default on my Linux system. >> >> -Jon >> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp >> > > _______________________________________________ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
