larsbrubaker c5f88756f2 Merge remote-tracking branch 'Greg/development' into development ... Conflicts: StaticData/PrinterSettings/Printrbot/Simple Metal/config.ini StaticData/PrinterSettings/Printrbot/Simple Metal/setup.ini		2014-07-02 16:30:26 -07:00
..
material
quality
config.ini
setup.ini