]> www.fi.muni.cz Git - bike-lights.git/commit
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)
commitcb10e19fb7311df4c3c14b64064c3d9a44fdacd1
treec55ac4c37f0abf44e19c8e3b9d73ab105ea5e875
parent9812e0e491f8582ea322138b440054f19cd1f792
parenteb2f91ea7806fd8f5b9a5597fcf5c13855911d71
Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/bike-lights

Conflicts:
firmware/adc.c
firmware/adc.c