merged from master

master
Gerolf Ziegenhain 8 years ago
parent 87dbb05d3e
commit d2f8a0b65f

@ -31,10 +31,7 @@
#include <mach/mach.h>
#endif
<<<<<<< HEAD:irmc.c
=======
#define DEBUG 0
>>>>>>> master:src/irmc.c
#define MAXDATASIZE 1024 // max number of bytes we can get at once

Loading…
Cancel
Save