]> www.fi.muni.cz Git - bike-lights.git/commit
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)
commitac9739610c642b6c79b800b406ffc16a86553e11
tree63499a10f6277271c05e1f23855ce78d63631ad9
parent88f407272caa26d8c63fded44d38d26972c11300
parent9c8fc5246057f13693731a58c814a1f6d40fa70e
Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/osvetleni

Conflicts:
lights.c