From: Jon E. <gi...@gi...> - 2011-11-17 03:34:14
|
Merge branch 'v2.5_branch' of ssh://git.linuxcnc.org/git/emc2 into v2.5_branch http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=dbba7be .gitignore | 2 +- docs/src/common/Getting_EMC.txt | 2 +- docs/src/common/Getting_EMC_fr.txt | 123 ++-- docs/src/common/axis_fr.png | Bin 26627 -> 0 bytes docs/src/common/images/mini_fr.jpg | Bin 0 -> 34761 bytes docs/src/common/images/tkemc_fr.png | Bin 0 -> 14721 bytes docs/src/common/machining_center_fr.txt | 12 +- docs/src/common/mini_fr.jpg | Bin 34761 -> 0 bytes docs/src/common/tkemc_fr.png | Bin 14721 -> 0 bytes docs/src/common/user_intro_fr.txt | 4 +- docs/src/common/userforeword_fr.txt | 4 +- docs/src/config/ini_homing_fr.txt | 6 +- docs/src/config/stepconf_fr.txt | 2 +- docs/src/gcode/main_fr.txt | 1100 ++++++++++++++------------ docs/src/gcode/mill_canned_fr.txt | 129 ++-- docs/src/gcode/overview_fr.txt | 8 +- docs/src/gui/axis-codeentry_fr.png | Bin 3326 -> 0 bytes docs/src/gui/axis_fr.txt | 8 +- docs/src/gui/gladevcp_fr.txt | 10 +- docs/src/gui/image-to-gcode_fr.txt | 4 +- docs/src/gui/images/lathe-tool_fr.png | Bin 0 -> 51476 bytes docs/src/gui/images/lathe-tool_fr.svg | 528 ++++++++++++ docs/src/gui/images/mini01_fr.png | Bin 0 -> 11259 bytes docs/src/gui/images/mini_fr.jpg | Bin 0 -> 34761 bytes docs/src/gui/images/miniauto_fr.png | Bin 0 -> 3163 bytes docs/src/gui/images/minibkplot_fr.png | Bin 0 -> 7657 bytes docs/src/gui/images/miniedit_fr.png | Bin 0 -> 5797 bytes docs/src/gui/images/miniman_fr.png | Bin 0 -> 2889 bytes docs/src/gui/images/minioffsets_fr.png | Bin 0 -> 7166 bytes docs/src/gui/images/minitool_fr.png | Bin 0 -> 3776 bytes docs/src/gui/images/tkemc_fr.png | Bin 0 -> 14721 bytes docs/src/gui/images/tkemc_interp_fr.png | Bin 0 -> 3122 bytes docs/src/gui/mini01_fr.png | Bin 11259 -> 0 bytes docs/src/gui/mini_fr.txt | 20 +- docs/src/gui/miniauto_fr.png | Bin 3163 -> 0 bytes docs/src/gui/minibkplot_fr.png | Bin 7657 -> 0 bytes docs/src/gui/miniedit_fr.png | Bin 5797 -> 0 bytes docs/src/gui/miniman_fr.png | Bin 2889 -> 0 bytes docs/src/gui/minioffsets_fr.png | Bin 7166 -> 0 bytes docs/src/gui/minitool_fr.png | Bin 3776 -> 0 bytes docs/src/gui/tkemc_fr.png | Bin 14721 -> 0 bytes docs/src/gui/tkemc_fr.txt | 4 +- docs/src/gui/tkemc_interp_fr.png | Bin 3122 -> 0 bytes docs/src/hal/basic_hal_fr.txt | 4 +- docs/src/hal/general_ref_fr.txt | 8 +- docs/src/hal/hal-examples_fr.txt | 6 - docs/src/hal/halmodule_fr.txt | 271 ++----- docs/src/hal/images/pyvcp_AXIS_fr.png | Bin 0 -> 28413 bytes docs/src/hal/images/pyvcp_label_fr.png | Bin 0 -> 683 bytes docs/src/hal/images/pyvcp_labelframe_fr1.png | Bin 0 -> 733 bytes docs/src/hal/images/pyvcp_mypanel_fr.png | Bin 0 -> 2947 bytes docs/src/hal/images/pyvcp_radiobutton_fr.png | Bin 0 -> 780 bytes docs/src/hal/pyvcp_AXIS_fr.png | Bin 28413 -> 0 bytes docs/src/hal/pyvcp_examples_fr.txt | 2 +- docs/src/hal/pyvcp_fr.txt | 22 +- docs/src/hal/pyvcp_label_fr.png | Bin 683 -> 0 bytes docs/src/hal/pyvcp_labelframe_fr1.png | Bin 733 -> 0 bytes docs/src/hal/pyvcp_mypanel_fr.png | Bin 2947 -> 0 bytes docs/src/hal/pyvcp_radiobutton_fr.png | Bin 780 -> 0 bytes docs/src/hal/tutorial_fr.txt | 4 +- docs/src/install/Latency_Test_fr.txt | 2 +- docs/src/motion/kinematics_fr.txt | 8 +- src/hal/components/message.comp | 124 +++ 63 files changed, 1524 insertions(+), 893 deletions(-) |