kicad-developers team mailing list archive

[Simon Richter <Simon.Richter@xxxxxxxxxx>]

Hi,

On 18.07.2016 19:54, Wayne Stambaugh wrote:

> I could not merge your branch into the product branch.  Here is the
> merge error message:

Rebasing that branch is going to be difficult because of all the
backmerges from mainline.

If we don't care about the branch history, I've attached a diff between
the current product branch tip and Mario's branch (fixing one conflict
in a comment and reverting the bitmaps).

   Simon