# 
# patch "ChangeLog"
#  from [a62a6d882a027cce2c3ce56938c68dd5e5d46be4]
#    to [cbe15bbbfa3d898d55e5356d6dec9b317c5170fb]
# 
# patch "netsync.cc"
#  from [f29b8cf04f7f4ef176165d31cd446c359233007a]
#    to [c4933c5062e859a98b69e9dfa872b45a5be919da]
# 
========================================================================
--- ChangeLog	a62a6d882a027cce2c3ce56938c68dd5e5d46be4
+++ ChangeLog	cbe15bbbfa3d898d55e5356d6dec9b317c5170fb
@@ -1,5 +1,9 @@
 2005-09-16  Timothy Brownawell  <address@hidden>
 
+	* netsync.cc: finish renaming things, so it compiles again...
+
+2005-09-16  Timothy Brownawell  <address@hidden>
+
 	* contrib/usher.cc: A simple usher/proxy server. It asks connecting
 	clients for their include pattern, and then forwards the connection
 	to an appropriate (as given in a config file) monotone server. Note
========================================================================
--- netsync.cc	f29b8cf04f7f4ef176165d31cd446c359233007a
+++ netsync.cc	c4933c5062e859a98b69e9dfa872b45a5be919da
@@ -2979,12 +2979,12 @@
 bool
 session::process_usher_cmd(utf8 const & msg)
 {
-  if (greeting().size())
+  if (msg().size())
     {
-      if (greeting()[0] == '!')
-        P(F("Received warning from usher: %s") % greeting().substr(1));
+      if (msg()[0] == '!')
+        P(F("Received warning from usher: %s") % msg().substr(1));
       else
-        L(F("Received greeting from usher: %s") % greeting().substr(1));
+        L(F("Received greeting from usher: %s") % msg().substr(1));
     }
   netcmd cmdout;
   cmdout.write_usher_reply_cmd(our_include_pattern);