Lars Brubaker 2a2a9c2ebd Merge branch '1.2.2' into development ... Conflicts: StaticData/PrinterSettings/RoBo 3D/R1/config.ini		2015-04-07 11:25:01 -07:00
..
Drivers	Put in flashforge hardware ids	2015-02-24 16:57:22 -08:00
Fonts
Icons	Adding in the touchscreen icons	2015-04-06 16:01:57 -07:00
OEMSettings	added MakerGear to printer white list	2015-03-30 16:39:53 -07:00
PrinterSettings	Merge branch '1.2.2' into development	2015-04-07 11:25:01 -07:00
SliceSettings	Moving to using submodules	2015-02-26 10:17:41 -08:00
Sounds
Translations	Merge in touch screen code.	2015-04-06 15:39:22 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png