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
..
Printrbot Jr	Put in a default material for all printers.	2014-05-08 14:16:54 -07:00
Printrbot LC	Put in a default material for all printers.	2014-05-08 14:16:54 -07:00
Printrbot PLUS	Put in a default material for all printers.	2014-05-08 14:16:54 -07:00
Simple	Adding some printer profiles.	2014-07-02 13:32:13 -07:00
Simple Metal	Merge remote-tracking branch 'Greg/development' into development	2014-07-02 16:30:26 -07:00