On 02/18/2015 08:20 AM, Bence Kovács wrote: > We have added author: > https://github.com/geris2/linuxcnc-mirror/commits/gm-driver-fix > <https://www.google.com/url?q=https%3A%2F%2Fgithub.com%2Fgeris2%2Flinuxcnc-mirror%2Fcommits%2Fgm-driver-fix&sa=D&sntz=1&usg=AFQjCNFe_-yQ3wsRMhZd-rpVqP5k6Lf8jw>
The Author and the S-o-B both look good in that branch. > I am not sure about LinuxCNC version policy. The policy is pretty much this: bug fixes go in the oldest applicable branch, new features go in master or is the pre-release branch, as appropriate (it's a judgement call). > -As 2.7 support uspace, that commit probably belongs to 2.7. > -License change was needed by a uspace function call, so that commit may > also belong to 2.7. Agreed. > -The RS485 fix commit may be checked in to the branch, where any other > fix is currently checked in. 2.6 or master, what do you think? 2.6. I'll move it there. Ok, i applied the RS-485 fix in 2.6 and merged to 2.7, then applied the uspace updates in 2.7. Thanks! -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
