added code with merge conflict as note to self, accelleration will just have to wait

2010-12-20 14:01:38 +01:00
parent 703d812b85
commit 48b596c2fe
7 changed files with 158 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 *.hex
 *.o
-*.elf
+*.elf
+.DS_Store