From: Sebastian K. <gi...@gi...> - 2012-11-03 16:01:18
|
Merge branch 'v2.5_branch' Conflicts: src/emc/usr_intf/schedrmt.cc (master had an incorrect for failure, this commit fixes it) http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=d722ac9 src/emc/usr_intf/schedrmt.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) |