mattercontrol/StaticData
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
..
Drivers
Fonts
Icons Added TAZ 4 Printer Profiles 2014-07-02 14:01:39 -07:00
OEMSettings Reverse non-general change to vanilla settings. 2014-06-10 19:40:50 -07:00
PrinterSettings Merge remote-tracking branch 'Greg/development' into development 2014-07-02 16:30:26 -07:00
SliceSettings Put all the icons into the icons directory 2014-06-19 11:25:28 -07:00
Sounds
Translations Made 3D views editable while printing (if not the embedded view). 2014-07-02 13:28:51 -07:00
application.ico Added some test code. 2014-04-17 12:21:51 -07:00
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png