fixing merge conflict
authorArthur Wolf <wolf.arthur@gmail.com>
Sat, 16 Mar 2013 20:03:41 +0000 (21:03 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Sat, 16 Mar 2013 20:03:41 +0000 (21:03 +0100)
commit4a43ef913ca66b663bf02983e1acc9eed58ed5d6
tree8aa849ddcb5a935889be5a6b1cc59b8434c68905
parentc26b74866f3a99404fa37d060474bebed394cb8d
parent7c21d84a4591cadea19f5b30f8affb78f359c53c
fixing merge conflict
src/libs/StepTicker.cpp
src/libs/StepperMotor.cpp
src/main.cpp