merged master

This commit is contained in:
Simen Svale Skogsrud
2011-01-31 19:42:56 +01:00
9 changed files with 70 additions and 67 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
*.hex
*.o
*.elf
.DS_Store
*.DS_Store