summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2015-10-13 02:27:56 +0200
committerChristian Pointner <equinox@spreadspace.org>2015-10-13 02:28:01 +0200
commit6bc291c0fd3e1760ca4bfeaf33b38cbb4b21830c (patch)
tree887c41ec771a48d3323c9d2a2e0d7f6c86c36736 /.gitignore
parentrenamed files to prepare merge of code dirs (diff)
merged app sources to single folder
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 7 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 8d5f435..c83f3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,13 @@
contrib/alsa-utils*
contrib/avr-utils
contrib/.spreadavr.prepared
-server/include.mk
-server/dolmetschctl
-server/*.o
-server/*.d
-server/*.d.*
-server/config.h
-client/include.mk
-client/dolmetschctl-client
-client/*.o
-client/*.d
-client/*.d.*
-client/config.h
+app/include.mk
+app/dolmetschctl
+app/dolmetschctl-client
+app/*.o
+app/*.d
+app/*.d.*
+app/config.h
firmware/*.a
firmware/*.o
firmware/*.d