From: Michael H. <gi...@gi...> - 2013-04-29 16:46:48
|
Merge remote-tracking branch 'origin/v2.5_branch' into rtos-integration-preview3 http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=8b9ff03 docs/src/config/ini_config.txt | 15 +++++++++++++-- tests/linuxcncrsh/skip | 0 tests/mdi-queue/oword-queue-buster/skip | 0 tests/mdi-queue/simple-queue-buster/skip | 0 tests/motion/g0/test.sh | 2 +- tests/t0/nonrandom/skip | 0 tests/t0/random-with-t0/skip | 0 tests/t0/random-without-t0/skip | 0 tests/toolchanger/toolno-pocket-differ/nonrandom/skip | 0 tests/toolchanger/toolno-pocket-differ/random/skip | 0 tests/toolchanger/toolno-pocket-differ/shared-test.sh | 2 +- 11 files changed, 15 insertions(+), 4 deletions(-) |