I just tried to (locally) merge 2.8 into Master. I decided to use the "ours" strategy so that nothing actually changed, all I wanted to do was mark them as merged, without changing anything,
Looking at the dry-run patch, though, quite a lot seemed to change, though comparing the patches to the current master on github, most of the changes seemed to already be included. So I am puzzled. Especially as Hans merged on the 16th September. Is there anything in 2.8 that _should_ be merged up to Master? -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
