#
#
# patch "cmd_netsync.cc"
#  from [abfe8564939bb8b06238dbe375269149fe510d27]
#    to [8d41ec9f506e1524ed41b421a16c904355d9f267]
# 
# patch "network.hh"
#  from [08043161052d6397db7ecb78ed2af4781585690a]
#    to [4580de992b917b3a75c39d86c49b50b1c4976b44]
#
============================================================
--- cmd_netsync.cc	abfe8564939bb8b06238dbe375269149fe510d27
+++ cmd_netsync.cc	8d41ec9f506e1524ed41b421a16c904355d9f267
@@ -1,8 +1,8 @@
 #include "cmd.hh"
 
 #include "diff_patch.hh"
 #include "netcmd.hh"
-#include "network.hh"
+#include "netsync.hh"
 #include "globish.hh"
 #include "keys.hh"
 #include "cert.hh"
============================================================
--- network.hh	08043161052d6397db7ecb78ed2af4781585690a
+++ network.hh	4580de992b917b3a75c39d86c49b50b1c4976b44
@@ -16,13 +16,6 @@ class transaction_guard;
 
 class transaction_guard;
 
-typedef enum
-  {
-    server_voice,
-    client_voice
-  }
-protocol_voice;
-
 class session;
 
 struct state