summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2017-03-25 20:46:47 +0100
committerNao Pross <naopross@thearcway.org>2017-03-25 20:46:47 +0100
commit8956c5ecce6c832efcde9b0ab78b1ec811a2b846 (patch)
tree30df5b51329a8f32df6f46709c3726eea3d59632
parentadded missing makefile for z80 and fixed gitignore (diff)
parentadded missing makefile for z80 and fixed gitignore (diff)
downloadz80uPC-8956c5ecce6c832efcde9b0ab78b1ec811a2b846.tar.gz
z80uPC-8956c5ecce6c832efcde9b0ab78b1ec811a2b846.zip
Merge branch 'master' into naopross
-rw-r--r--.gitignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e3afa4d..23cb2e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,10 @@ sw/**/*.hex
sw/**/*.bin
sw/**/*.o
sw/**/*.a
+
+# custom
+various/*
+
+# sublime
+z80.sublime-project
+z80.sublime-workspace