]> www.fi.muni.cz Git - bike-lights.git/commitdiff
https://www.fi.muni.cz/~kas/git / bike-lights.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9812e0e eb2f91e)
Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/bike-lights
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 18 Jan 2013 21:50:50 +0000 (22:50 +0100)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 18 Jan 2013 21:50:50 +0000 (22:50 +0100)
Conflicts:
firmware/adc.c

1  2 
firmware/adc.c patch | diff1 | diff2 | blob | history

diff --cc firmware/adc.c
Simple merge
Bike Lights: see http://www.fi.muni.cz/~kas/bike-lights/