src/tg/tg_scene.h
@@ -13,7 +13,11 @@ #include "../protocol.h" #include "module_def.h" <<<<<<< HEAD #pragma pack (1) ======= >>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430 typedef struct { unsigned short magic; unsigned short nmds; @@ -24,7 +28,13 @@ tag_input input; //1362 <<<<<<< HEAD tag_module in1[MAX_INPUT_NUM]; //4352 ======= tag_input input;//1282 tag_module in1[MAX_INPUT_NUM]; >>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430 tag_module in2[MAX_INPUT_NUM]; tag_module in3[MAX_INPUT_NUM]; tag_module in4[MAX_INPUT_NUM];
