Back
[08:12:21] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/ (emc2-wizard-pickconfig.gif emc2.xcf): update/merge classicladder branch to emc 2.3 trunk
[08:12:22] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/Sherline4Axis/ (8 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:22] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/SherlineLathe/ (7 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:24] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/common/configurable_options/ladder/ (blank.clp estop.clp serialmodbus.clp): update/merge classicladder branch to emc 2.3 trunk
[08:12:26] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/classicladder/cl-estop/ (9 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:29] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/hm2-servo/ (13 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:32] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/cooltool/ (19 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:35] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/common/configurable_options/pyvcp/ (blank.xml spindle.xml thc_vcp.xml xyzjog.xml): update/merge classicladder branch to emc 2.3 trunk
[08:12:40] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/Sherline3Axis/ (7 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:45] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/halui_pyvcp/ (7 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:48] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/plasma-thc-sim/SheetCam/ (SheetCamEMCPlasma.post SheetCamEMCPlasma.scpost): update/merge classicladder branch to emc 2.3 trunk
[08:12:51] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/plasma-thc-sim/axis_manualtoolchange.hal: update/merge classicladder branch to emc 2.3 trunk
[08:12:54] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/plasma-thc/ (20 files): update/merge classicladder branch to emc 2.3 trunk
[08:12:57] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/hm2-stepper/ (13 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:02] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/sim/gs2.hal: update/merge classicladder branch to emc 2.3 trunk
[08:13:11] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/plasma-thc/SheetCam/ (SheetCamEMCPlasma.post SheetCamEMCPlasma.scpost): update/merge classicladder branch to emc 2.3 trunk
[08:13:14] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/vismach/ (14 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:19] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/ (7 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:22] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-5.10/usr/share/applications/ (3 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:25] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/configs/tormach/ (9 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:28] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-7.10/usr/share/applications/ (3 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:35] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-6.06/usr/share/applications/ (3 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:38] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/etc/modprobe.d/emc2: update/merge classicladder branch to emc 2.3 trunk
[08:13:47] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/usr/share/applications/ (8 files): update/merge classicladder branch to emc 2.3 trunk
[08:13:50] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/emc2.files: update/merge classicladder branch to emc 2.3 trunk
[08:13:53] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/etc/xdg/menus/applications-merged/cnc.menu: update/merge classicladder branch to emc 2.3 trunk
[08:13:58] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/usr/share/desktop-directories/cnc.directory: update/merge classicladder branch to emc 2.3 trunk
[08:14:01] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-5.10/usr/share/applications/ (emc2-gettingstarted.desktop emc2-halmanual.desktop): update/merge classicladder branch to emc 2.3 trunk
[08:14:10] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-Ubuntu-8.04/usr/share/pixmaps/emc2icon.png: update/merge classicladder branch to emc 2.3 trunk
[08:14:13] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-6.06/usr/share/applications/ (emc2-gettingstarted.desktop emc2-halmanual.desktop): update/merge classicladder branch to emc 2.3 trunk
[08:14:16] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-8.04/emc2.files: update/merge classicladder branch to emc 2.3 trunk
[08:14:21] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-8.04/etc/xdg/menus/applications-merged/cnc.menu: update/merge classicladder branch to emc 2.3 trunk
[08:14:24] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-8.04/usr/share/applications/ (7 files): update/merge classicladder branch to emc 2.3 trunk
[08:14:33] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-8.04/usr/share/desktop-directories/cnc.directory: update/merge classicladder branch to emc 2.3 trunk
[08:14:36] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/TODO: update/merge classicladder branch to emc 2.3 trunk
[08:14:39] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/man/man1/ (bfload.1 gs2.1): update/merge classicladder branch to emc 2.3 trunk
[08:14:42] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/man/man3/ (13 files): update/merge classicladder branch to emc 2.3 trunk
[08:14:47] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/man/man9/ (hm2_7i43.9 hm2_pci.9 hostmot2.9 opto_ac5.9): update/merge classicladder branch to emc 2.3 trunk
[08:14:50] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/src/ (Getting_Started.lyx Getting_Started_fr.lyx): update/merge classicladder branch to emc 2.3 trunk
[08:14:57] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/src/code/NML_Messages.lyx: update/merge classicladder branch to emc 2.3 trunk
[08:15:00] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/debian/extras-sim-Ubuntu-8.04/usr/share/pixmaps/emc2icon.png: update/merge classicladder branch to emc 2.3 trunk
[08:15:03] <CIA-2> EMC: 03cmorley 07cl_v7124_branch * 10emc2/docs/src/common/ (24 files): update/merge classicladder branch to emc 2.3 trunk
[08:15:06] <CIA-2> (56 lines omitted)
[08:18:08] <fenn_> fenn_ is now known as fenn
[11:13:27] <BigJohnT_> BigJohnT_ is now known as BigJohnT
[16:33:14] <jmkasunich> commit storm...
[19:24:05] <CIA-2> EMC: 03cmorley 07TRUNK * 10emc2/src/Makefile: add pncconf configuration program to branch
[19:24:07] <CIA-2> EMC: 03cmorley 07TRUNK * 10emc2/src/emc/usr_intf/pncconf/ (Submakefile m5i20panel.xml pncconf.glade pncconf.py): add pncconf configuration program to branch
[19:36:44] <alex_joni> I wonder what branch cmorley meant
[19:43:47] <CIA-2> EMC: 03cmorley 07TRUNK * 10emc2/src/Makefile: fix typo