Hi Michael, I guess by the time I pulled master this morning after the merge yesterday you were behind again with the patch... and I get the blasted error again.
Thanks John On 1/9/2012 5:50 AM, Michael Haberler wrote: > sorry, I forgot to pull/rebase on master > > it should be fine now: > > http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/g84-dev > > - Michael > > Am 07.01.2012 um 13:23 schrieb John Thornton: > >> Michael, >> >> I've tried creating a test branch off of master and off of 2.5 then >> applying the patch but I get an error when I run git am. >> >> error: patch failed: src/emc/rs274ngc/interp_cycles.cc:347 >> >> I think Rob also had a problem but he didn't spell it out but mentioned >> git so I suspect it might be the same. >> >> Thanks >> John >> >> On 1/6/2012 2:18 AM, Michael Haberler wrote: >>> I worked in cradek's irc remarks from yesterday >>> >>> I also made an attempt at the yz/xz planes 'by analogy' from cycle_feed() - >>> I am unsure wether this a) makes sense b) is correct >>> >>> http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/g84-dev >>> >>> I would appreciate a test/feedback by the interested folks >>> >>> interestingly, the g84.1 in plane g18 and g19 now stop at the bottom like >>> g81 which I dont understand, too >>> >>> -Michael >>> ------------------------------------------------------------------------------ >>> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex >>> infrastructure or vast IT resources to deliver seamless, secure access to >>> virtual desktops. With this all-in-one solution, easily deploy virtual >>> desktops for less than the cost of PCs and save 60% on VDI infrastructure >>> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox >>> _______________________________________________ >>> Emc-developers mailing list >>> Emc-developers@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/emc-developers >> ------------------------------------------------------------------------------ >> Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex >> infrastructure or vast IT resources to deliver seamless, secure access to >> virtual desktops. With this all-in-one solution, easily deploy virtual >> desktops for less than the cost of PCs and save 60% on VDI infrastructure >> costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox >> _______________________________________________ >> Emc-developers mailing list >> Emc-developers@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/emc-developers > > ------------------------------------------------------------------------------ > Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex > infrastructure or vast IT resources to deliver seamless, secure access to > virtual desktops. With this all-in-one solution, easily deploy virtual > desktops for less than the cost of PCs and save 60% on VDI infrastructure > costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers ------------------------------------------------------------------------------ Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex infrastructure or vast IT resources to deliver seamless, secure access to virtual desktops. With this all-in-one solution, easily deploy virtual desktops for less than the cost of PCs and save 60% on VDI infrastructure costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
