]> 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: 88f4072 9c8fc52)
Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 14 Jun 2012 21:57:45 +0000 (23:57 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Thu, 14 Jun 2012 21:57:45 +0000 (23:57 +0200)
Conflicts:
lights.c


Trivial merge
Bike Lights: see http://www.fi.muni.cz/~kas/bike-lights/