g0dub/irmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merged from master

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/irmc.c
View File

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