1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-07 04:56:34 +01:00

Fixed conflicts

This commit is contained in:
mannol
2014-07-10 01:29:18 +02:00
32 changed files with 614 additions and 543 deletions

View File

@@ -81,4 +81,4 @@ DeviceError write_out(uint32_t device_idx, int16_t* data, uint32_t lenght, uint8
void print_devices(ToxWindow* self, DeviceType type);
DeviceError selection_valid(DeviceType type, int32_t selection);
#endif /* _device_h */
#endif /* _device_h */