Commit 0fd83ad7 authored by KUHN Matthieu's avatar KUHN Matthieu

Merge

parent bb7cff5f
......@@ -21,11 +21,7 @@
#define MAPHYS_ICNTL_SIZE 61
#define MAPHYS_RCNTL_SIZE 21
#define MAPHYS_IINFO_SIZE 37
<<<<<<< HEAD
#define MAPHYS_RINFO_SIZE 39
=======
#define MAPHYS_RINFO_SIZE 39
>>>>>>> 4ed7a31b9c10e79abd969a0a648f0adcbd6d0db1
#define MAPHYS_IINFOG_SIZE 6
#define MAPHYS_RINFOG_SIZE 4
#define MAPHYS_IKEEP_SIZE 70
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment