Commit Graph

9 Commits

Author SHA1 Message Date
Lukas Bachschwell dbf9fc1d4f Added RFID and Finger checking 2015-07-16 15:39:44 +02:00
Lukas 2ed3fe415d added finger 2015-07-13 19:38:17 +02:00
Alexander Junk 398e5784e8 Merge branch 'master' of ssh://84.200.240.140/home/git/beerBoxGit
merged
2015-07-13 19:32:53 +02:00
Alexander Junk 13bbc2d1b1 merge 2015-07-13 19:32:39 +02:00
Lukas d6e332a656 bla LB 2015-07-13 19:31:57 +02:00
Alexander Junk e82e5729aa Save 2015-07-13 19:09:27 +02:00
Alexander Junk 173e464808 Merged berbox.cpp with main sketch 2015-07-13 18:23:51 +02:00
Alexander Junk 3a1796123a Second commit 2015-07-13 16:59:02 +02:00
Alexander Junk 995fd9b815 First commit 2015-07-13 16:49:36 +02:00