nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add LoadIcon helper function

Browse source
This commit is contained in:
John Lewin 2014-11-25 08:42:18 -08:00
parent eba756966b
commit 28159053ab
9 changed files with 26 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SettingsManagement/OemSettings.cs
View file

@ -4,11 +4,8 @@ using System.Linq;
using System.Text;
using System.IO;
using MatterHackers.MatterControl.DataStorage;
<<<<<<< HEAD
using Newtonsoft.Json;
=======
using MatterHackers.Agg.PlatformAbstract;
>>>>>>> Initial StaticData platform abstraction
namespace MatterHackers.MatterControl.SettingsManagement
{