Am 02.10.2012 um 07:50 schrieb Sebastian Kuzminsky: > On 10/01/2012 11:33 PM, Sebastian Kuzminsky wrote: >> Merge 2.5 into master >> >> Conflicts: >> src/emc/rs274ngc/interp_o_word.cc >> src/emc/rs274ngc/rs274ngc_pre.cc >> >> >> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=7a00477 > > Michael (Haberler), would you mind checking to make sure I didn't mess > up the conflict resolution on interp_o_word.cc and rs274ngc_pre.cc? > That's all your code.
I looked through them, and they look fine to me thanks! - Michael > > The intent of the interp_o_word.cc merge was to propagate a couple of > strcpy()/strncpy() fixes from 2.5. > > Thanks... > > -- > Sebastian Kuzminsky > > > ------------------------------------------------------------------------------ > Don't let slow site performance ruin your business. Deploy New Relic APM > Deploy New Relic app performance management and know exactly > what is happening inside your Ruby, Python, PHP, Java, and .NET app > Try New Relic at no cost today and get our sweet Data Nerd shirt too! > http://p.sf.net/sfu/newrelic-dev2dev > _______________________________________________ > Emc-developers mailing list > Emc-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/emc-developers ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
