summaryrefslogtreecommitdiff
BranchCommit messageAuthorAge
masterMerge branch '2.6'Chris Radek6 years
 
 
AgeCommit messageAuthorFilesLines
2014-06-18Merge branch '2.6'HEADmasterChris Radek3-2/+30
2014-06-18Fix crash on debian wheezy + gcc4.7.2Chris Radek2-2/+2
2014-06-18Remove unused prototypeChris Radek1-4/+0
2014-06-18Fix many prototypesChris Radek1-27/+27
2014-06-15gscreen -fix combobox not following keyboard increment changesChris Morley2-16/+38
2014-06-15gscreen -fix keybinding blocking MDI/Gcode entryChris Morley1-5/+18
2014-06-12Docs: add info on trajectory planner ini optionsJohn Thornton2-0/+126
2014-06-11Update changelog & VERSION for 2.6.0~pre4Sebastian Kuzminsky2-1/+29
2014-06-11Merge branch '2.6'Chris Radek2-9/+13
2014-06-11pickconfig: speed automatic closing of other branchesJeff Epler1-2/+2
[...]
 
Clone
git://diyhpl.us/linuxcnc
git+ssh://diyhpl.us/srv/git/linuxcnc