merged from master

This commit is contained in:
Gerolf Ziegenhain 2015-01-04 14:43:50 +01:00
parent 87dbb05d3e
commit d2f8a0b65f
1 changed files with 0 additions and 3 deletions

View File

@ -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