From: Michael Wiebusch <m.wiebusch@gsi.de>
Date: Wed, 9 Dec 2015 16:43:25 +0000 (+0100)
Subject: mergend firmware and user interface
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7171a377dc1307a717d26b249f120c5c963f2823;p=coral.git

mergend firmware and user interface
---

7171a377dc1307a717d26b249f120c5c963f2823
diff --cc .gitignore
index 280e909,5308267..850ec22
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,4 +1,12 @@@
 -misc
 +*.eep
 +*.elf
 +*.hex
 +*.sym
 +*.a
 +*.map
 +*.lss
 +*.o
 +*~
 +*.d
+ *.dat
+ *.png
 -*~