#
# patch "ChangeLog"
#  from [4a9d3e3d72df10d5792c526a70166bed2621e236]
#    to [a4e2cd7768c78ad715c7f5425977a48c6cb82eef]
#
# patch "monotone.cc"
#  from [2419f27fdb3cba77c658c0f4eac4d0b5026e1884]
#    to [0139d2c71dbb12198e6206749b71ecb1e6286459]
#
# patch "netsync.cc"
#  from [98bb94f9c22a40bc6f826cad62737a7f9bfb9a04]
#    to [b68476ffc5852e56195629f4998af91221e48dcd]
#
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,22 @@
+2005-04-17  Matthew Gregan  <address@hidden>
+
+	* monotone.cc: Fix warnings: add missing initializers.
+	* netsync.cc: Fix warnings: inline static vs static inline.
+
 2005-04-16  Nathaniel Smith  <address@hidden>

+	* testsuite.at: Use a random server port.
+	
+	* .mt-attrs, contrib/README: Update for Notify.pl ->
+	monotone-notify.pl rename.
+	
+	* monotone.1: Warn people off rcs_import.
+	* monotone.texi (Commands): Likewise.
+
+2005-04-16  Nathaniel Smith  <address@hidden>
+
+2005-04-16  Nathaniel Smith  <address@hidden>
+
 	* tests/t_update_nonexistent.at: New test.
 	* testsuite.at: Add it.
 	
@@ -2856,7 +2873,7 @@
 	* AUTHORS: Mention Wojciech and Neil.
 	* revision.cc (calculate_ancestors_from_graph): Make non-recursive.

-2005-01-17  Wojciech Miłkowski  <address@hidden>
+2005-01-17  Wojciech Miłkowski  <address@hidden>

 	* std_hooks.lua: Teach about meld.

--- monotone.cc
+++ monotone.cc
@@ -73,7 +73,7 @@
     {"root", 0, POPT_ARG_STRING, &argstr, OPT_ROOT, "limit search for working copy to specified root", NULL},
     {"depth", 0, POPT_ARG_LONG, &arglong, OPT_DEPTH, "limit the log output to the given number of entries", NULL},
     {"xargs", '@', POPT_ARG_STRING, &argstr, OPT_ARGFILE, "insert command line arguments taken from the given file", NULL},
-    { NULL, 0, 0, NULL, 0 }
+    { NULL, 0, 0, NULL, 0, NULL, NULL }
   };

 // there are 3 variables which serve as roots for our system.
--- netsync.cc
+++ netsync.cc
@@ -725,7 +725,7 @@
   attached[i] = curr_attached;
 }

-static inline id
+inline static id
 plain_id(manifest_id const & i)
 {
   id tmp;
@@ -734,7 +734,7 @@
   return tmp;
 }

-static inline id
+inline static id
 plain_id(file_id const & i)
 {
   id tmp;