aboutsummaryrefslogtreecommitdiff
path: root/host
diff options
context:
space:
mode:
authorjaseg <jaseg@jaseg.net>2014-07-25 20:08:49 +0200
committerjaseg <jaseg@jaseg.net>2014-07-25 20:08:49 +0200
commitd5c8d1de1dd8a360a76d6ff66766e96f70cb50c2 (patch)
treec7cf90258cad02579a983db0dc3879c5de04b774 /host
parent49cd6259ba0b556deb167b3fb76a61c3b344a786 (diff)
parent50813d444ead5cc92a448f0a7feff6b22fba06cd (diff)
downloadmatelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.tar.gz
matelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.tar.bz2
matelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.zip
Merge branch 'mainhall-tmp'
Conflicts: firmware/main.c
Diffstat (limited to 'host')
0 files changed, 0 insertions, 0 deletions