aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2016-09-30 00:27:55 +1000
committerGitHub <[email protected]>2016-09-30 00:27:55 +1000
commit0b26e669af6d16fbdc5988558a702efdb35c116a (patch)
tree7261e77b4aab68a431c0d9eb3ea2d2056f8ca856 /.gitignore
parent278d29bf4c53587040c377045cd4e1c1868f5137 (diff)
downloadIronOS-0b26e669af6d16fbdc5988558a702efdb35c116a.tar.gz
IronOS-0b26e669af6d16fbdc5988558a702efdb35c116a.zip
Merge Dev into mainline (#1)v1.0
* 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
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
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