From 0b26e669af6d16fbdc5988558a702efdb35c116a Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Fri, 30 Sep 2016 00:27:55 +1000
Subject: Merge Dev into mainline (#1)

* Removing USB
Need to refine the drive to the iron tip

* Update README.md

* * Rewrite all code from scratch
* Only kept settings
* New font
* New PID
* New Menus
* Use Hardware I2C
* Faster System
* Better Heating Time
* No USB
* Full Menu System
---
 .gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index c1a6737c..d3860c43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.obj
 *.elf
 *.d
-
+*.DS_Store
 # Precompiled Headers
 *.gch
 *.pch
@@ -27,10 +27,13 @@
 *.app
 *.i*86
 *.x86_64
-*.hex
+workspace/*.hex
 
 # Debug files
 *.dSYM/
 *.su
 workspace/ts100/Debug/*
 workspace/.metadata/*
+
+workspace/ts100/.settings/language.settings.xml
+workspace/ts100/.cproject
-- 
cgit v1.2.3