On 03/09/2013 12:43 AM, Sebastian Kuzminsky wrote: > Merge branch 'v2.5_branch' > > > > http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=6dfcae3 > > > src/hal/utils/halsh.c | 6 +++++- > tcl/twopass.tcl | 24 ++++++++++++++++++++---- > 2 files changed, 25 insertions(+), 5 deletions(-)
Fair warning, linuxcnc-developers! Don't try to merge v2.5_branch into master unless you feel up for tackling Task. The next commit in 2.5 after this merge adds the mdi queueing test, which fails miserably on master. Next in 2.5 comes some commits that fix mdi queueing in 2.5, but those commits don't work right in master since the mdi queue handling was changed there. I'll be fixing mdi queueing in master over the next few days. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the endpoint security space. For insight on selecting the right partner to tackle endpoint security challenges, access the full report. http://p.sf.net/sfu/symantec-dev2dev _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
