[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00
parent 2e9f3bc1c0
commit c2c22d56c7
23 changed files with 311 additions and 371 deletions
@@ -46,6 +46,7 @@
 #define INIT_ORDER_DBCORE 18
 #define INIT_ORDER_BLACKBOX 17
 #define INIT_ORDER_SERVER_MAINT 16
+<<<<<<< HEAD
 #define INIT_ORDER_EVENTS 15
 #define INIT_ORDER_JOBS 14
 #define INIT_ORDER_TICKER 13
@@ -54,6 +55,18 @@
 #define INIT_ORDER_LANGUAGE 10
 #define INIT_ORDER_MACHINES 9
 #define INIT_ORDER_CIRCUIT 8
+=======
+#define INIT_ORDER_RESEARCH 15
+#define INIT_ORDER_EVENTS 14
+#define INIT_ORDER_JOBS 13
+#define INIT_ORDER_TICKER 12
+#define INIT_ORDER_MAPPING 11
+#define INIT_ORDER_ATOMS 10
+#define INIT_ORDER_NETWORKS 9
+#define INIT_ORDER_LANGUAGE 8
+#define INIT_ORDER_MACHINES 7
+#define INIT_ORDER_CIRCUIT 6
+>>>>>>> 92632ec... Merge pull request #32914 from kevinz000/NTNet
 #define INIT_ORDER_TIMER 1
 #define INIT_ORDER_DEFAULT 0
 #define INIT_ORDER_AIR -1