| commit | bc4b090b0abbec074e2407d252197e84a681cc83 | |
| author | jaseg <s@jaseg.de> | |
| Fri, 1 Jun 2012 21:13:03 +0000 (1 23:13 +0200) | ||
| committer | jaseg <s@jaseg.de> | |
| Fri, 1 Jun 2012 21:13:03 +0000 (1 23:13 +0200) | ||
| tree | 6e0d642ea864cfdcdbafe3e45bb6e0fd2ca1c55f | treesnapshot (tar.gz zip) |
| parent | 961fa04e15c4d10c83e6c8320e8b754b7b551b48 | commitdiff |
| parent | 5a26b2854f2e10c8be8ce78e18435ba7362988c0 | commitdiff |
Merge remote branch 'altar/master'
Merging changes so that single leds are adressable, switch debouncing
works (though it is not used here) etc.
Conflicts:
7seg.c
7seg.h
Makefile
input.c
input.h
led.c
led.h
Merging changes so that single leds are adressable, switch debouncing
works (though it is not used here) etc.
Conflicts:
7seg.c
7seg.h
Makefile
input.c
input.h
led.c
led.h
| config.c | diff2 | blobhistory | |
| config.h | diff1 | diff2 | blobhistory |