Merge branch 'master' into Subsurface-branch

This commit is contained in:
Dirk Hohndel 2015-10-13 19:23:32 -07:00
commit 1ccf937aa3

View File

@ -296,6 +296,7 @@ mares_iconhd_device_open (dc_device_t **out, dc_context_t *context, const char *
case PUCK2:
case NEMOWIDE2:
case SMART:
case SMARTAPNEA:
device->layout = &mares_nemowide2_layout;
device->packetsize = 256;
break;