emc

Merge branch 'toolchange-fixes' into v2.4_branch

Mon, 08 Feb 2010 15:53:01 +0000

Commit by cradek on v2.4_branch :: r5519ebb239cc /src/emc/iotask/ioControl.cc:

Merge branch 'toolchange-fixes' into v2.4_branch

on nonrandom, eliminate tool load if that tool is already loaded

Mon, 08 Feb 2010 15:52:59 +0000

Commit by cradek on master :: rb3a24b70a03d /src/emc/iotask/ioControl.cc:

on nonrandom, eliminate tool load if that tool is already loaded

Merge branch 'toolchange-fixes'

Mon, 08 Feb 2010 15:53:00 +0000

Commit by cradek on master :: r3ff82254970c /src/emc/iotask/ioControl.cc:

Merge branch 'toolchange-fixes'

Fix bogus prep when encountering Tn when n is already the loaded tool

Mon, 08 Feb 2010 15:52:58 +0000

Commit by cradek on master :: ra2312080c4c3 /src/emc/iotask/ioControl.cc:

Fix bogus prep when encountering Tn when n is already the loaded tool

Merge branch 'touchy-rpmreadout' into v2.4_branch

Sun, 07 Feb 2010 21:17:16 +0000

Commit by cradek on v2.4_branch :: re0faf4266880 /src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py):

Merge branch 'touchy-rpmreadout' into v2.4_branch

add a spindle speed readout on the manual tab

Sun, 07 Feb 2010 21:17:14 +0000

Commit by cradek on master :: rc002e292777f /src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py):

add a spindle speed readout on the manual tab

Merge branch 'touchy-rpmreadout'

Sun, 07 Feb 2010 21:17:15 +0000

Commit by cradek on master :: r128ce393cfd2 /src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py):

Merge branch 'touchy-rpmreadout'

make the single block switch work more like a feed hold

Sun, 07 Feb 2010 20:54:15 +0000

Commit by cradek on master :: rda874d2ed681 /src/emc/usr_intf/touchy/emc_interface.py:

make the single block switch work more like a feed hold

Merge branch 'touchy-feedhold' into v2.4_branch

Sun, 07 Feb 2010 20:54:17 +0000

Commit by cradek on v2.4_branch :: rb71806a55bd4 /src/emc/usr_intf/touchy/emc_interface.py:

Merge branch 'touchy-feedhold' into v2.4_branch

Merge branch 'touchy-feedhold'

Sun, 07 Feb 2010 20:54:16 +0000

Commit by cradek on master :: rf7b45ba8968e /src/emc/usr_intf/touchy/emc_interface.py:

Merge branch 'touchy-feedhold'

Merge branch 'master' into joints_axes3

Sat, 06 Feb 2010 17:35:01 +0000

Commit by micges on joints_axes3 :: rb200779f2808 / (276 files in 103 dirs):

Merge branch 'master' into joints_axes3

note changes during 2.4 development

Sat, 06 Feb 2010 15:22:06 +0000

Commit by jepler on v2.4_branch :: rcfd66883d2b6 /debian/changelog:

note changes during 2.4 development

note items changed during the 2.3.x series

Sat, 06 Feb 2010 15:22:05 +0000

Commit by jepler on v2.4_branch :: re4ce506ec298 /debian/changelog:

note items changed during the 2.3.x series

note changes since 2.3.4

Sat, 06 Feb 2010 14:46:40 +0000

Commit by jepler on v2_3_branch :: ref4a278e24d2 /debian/changelog:

note changes since 2.3.4

account for the case where xyz are not set

Sat, 06 Feb 2010 00:11:44 +0000

Commit by jepler on master :: rdf0bdc9f4b7d /lib/python/rs274/glcanon.py:

account for the case where xyz are not set

Merge remote branch 'jepler/glrefactor'

Fri, 05 Feb 2010 22:40:52 +0000

Commit by jepler on master :: rbae58918225c / (8 files in 6 dirs):

Merge remote branch 'jepler/glrefactor'

use antialiased font for DRO

Fri, 05 Feb 2010 22:40:51 +0000

Commit by jepler on master :: r896d315f9853 /src/emc/usr_intf/axis/scripts/axis.py:

use antialiased font for DRO

use standard fixed font instead of hardcoded font name for help

Fri, 05 Feb 2010 22:40:48 +0000

Commit by jepler on master :: rd1610854e0a2 /src/emc/usr_intf/axis/scripts/axis.py:

use standard fixed font instead of hardcoded font name for help

use tk8.5 standard font family names

Fri, 05 Feb 2010 22:40:46 +0000

Commit by jepler on master :: ra48c1c4a2b7c /tcl/emc.tcl.in:

use tk8.5 standard font family names

fix typo that prevented caching of standard font size

Fri, 05 Feb 2010 22:40:43 +0000

Commit by jepler on master :: r0853e94c89e1 /tcl/emc.tcl.in:

fix typo that prevented caching of standard font size