Merge lp://staging/~jeremyrcohen/fabinterpreter/Jeremy_Cohen into lp://staging/fabinterpreter

Proposed by Jeffrey Lipton
Status: Merged
Approved by: Jeffrey Lipton
Approved revision: 32
Merged at revision: 21
Proposed branch: lp://staging/~jeremyrcohen/fabinterpreter/Jeremy_Cohen
Merge into: lp://staging/fabinterpreter
Diff against target: 7154 lines (+3700/-1226)
39 files modified
README.txt (+7/-0)
software/Common/JrKerr/nmccom.cpp (+49/-33)
software/Common/JrKerr/nmccom.h (+2/-2)
software/Common/JrKerr/old_path/path.cpp (+650/-0)
software/Common/JrKerr/old_path/path.h (+83/-0)
software/Common/JrKerr/path.cpp (+11/-12)
software/Common/JrKerr/path.h (+10/-10)
software/Common/JrKerr/picservo.cpp (+35/-25)
software/Common/JrKerr/picservo.h (+17/-17)
software/Common/JrKerr/src/Makefile (+1/-1)
software/Common/JrKerr/src/Makefile.Debug (+1/-1)
software/Common/JrKerr/src/Makefile.Release (+1/-1)
software/Common/JrKerr/src/src.pro.user (+178/-37)
software/Duel Syringe - Model 2.config (+197/-0)
software/FabInterpreter/FabAtHomePrinter.cpp (+44/-122)
software/FabInterpreter/FabAtHomePrinter.h (+37/-8)
software/FabInterpreter/Interpreter.pro (+5/-3)
software/FabInterpreter/Interpreter.pro.user (+132/-121)
software/FabInterpreter/Makefile (+29/-38)
software/FabInterpreter/Motor.cpp (+116/-118)
software/FabInterpreter/Motor.h (+76/-78)
software/FabInterpreter/Path_Tester/Makefile (+271/-0)
software/FabInterpreter/Path_Tester/Path_Tester.pro (+21/-0)
software/FabInterpreter/Path_Tester/Path_Tester.pro.user (+228/-0)
software/FabInterpreter/Path_Tester/jrkerr.pro (+18/-0)
software/FabInterpreter/Path_Tester/main.cpp (+177/-0)
software/FabInterpreter/Util.h (+2/-7)
software/FabInterpreter/guicomponentsthread.cpp (+16/-8)
software/FabInterpreter/guicomponentsthread.h (+27/-20)
software/FabInterpreter/mainwindow.cpp (+140/-77)
software/FabInterpreter/mainwindow.h (+12/-9)
software/FabInterpreter/mainwindow.ui (+400/-475)
software/FabInterpreter/printthread.cpp (+12/-2)
software/FabInterpreter/printthread.h (+4/-0)
software/Plastic Tool - Model 2.config (+159/-0)
software/Valve - Model 2.config (+186/-0)
software/XYZ.config (+148/-0)
software/hybrid.config (+197/-0)
software/sparse_cube.fab (+1/-1)
To merge this branch: bzr merge lp://staging/~jeremyrcohen/fabinterpreter/Jeremy_Cohen
Reviewer Review Type Date Requested Status
Jeffrey Lipton Pending
Review via email: mp+32015@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: