Conflicts galore

2020-05-21 21:08:12 +03:00
parent 6192a0646c e792600115
commit 9d04b0835b
532 changed files with 9131 additions and 5662 deletions
@@ -18,6 +18,7 @@
 #define INVESTIGATE_CIRCUIT			"circuit"
 #define INVESTIGATE_FERMICHEM       "fermichem"
 #define INVESTIGATE_RCD				"rcd"
+#define INVESTIGATE_CRYOGENICS		"cryogenics"

 // Logging types for log_message()
 #define LOG_ATTACK		(1 << 0)