# 
# 
# patch "AUTHORS"
#  from [8c02db2ffc09b78507ae755f77a39c33f9605fb8]
#    to [fe74ae5336998343f4320ad9493df3b1ec3a52c8]
# 
# patch "ChangeLog"
#  from [64a209e3f6cbfdc02a87df7e0b01447edb95bf49]
#    to [985414350491d44328657fa434b43a5ec985620a]
# 
# patch "app_state.hh"
#  from [e635a3561b1ac5c00aa5f443ff98d95b17134f3d]
#    to [f4879c31f936326c7e402139b7a5a5179467876f]
# 
# patch "work.hh"
#  from [b45b65da7ad181697e3b8fe482109e02fbd1ce34]
#    to [a7d0ec4f02462a2562b5e9dca7d534b7fd81ddd6]
# 
============================================================
--- AUTHORS	8c02db2ffc09b78507ae755f77a39c33f9605fb8
+++ AUTHORS	fe74ae5336998343f4320ad9493df3b1ec3a52c8
@@ -69,6 +69,7 @@
   Patrick Mauritz <address@hidden>
   Grahame Bowland <address@hidden>
   Marcel van der Boom <address@hidden>
+  Roland McGrath <address@hidden>
 
 Several people have also contributed to the translation of monotone
 into non-English languages; their work is available in the po/
============================================================
--- ChangeLog	64a209e3f6cbfdc02a87df7e0b01447edb95bf49
+++ ChangeLog	985414350491d44328657fa434b43a5ec985620a
@@ -1,3 +1,14 @@
+2005-12-18  graydon hoare  <address@hidden>
+
+	* AUTHORS: Add Roland.
+
+2005-12-17  Roland McGrath  <address@hidden>
+
+	* work.hh (struct file_itemizer): Remove extraneous qualifier on
+	visit_file declaration.
+	* app_state.hh (class app_state): Remove extraneous qualifier on
+	set_restriction declaration.
+
 2005-12-14  Matthew Gregan  <address@hidden>
 
 	* win32/fs.cc: Handle the fact that the MoveFileEx symbol might
============================================================
--- app_state.hh	e635a3561b1ac5c00aa5f443ff98d95b17134f3d
+++ app_state.hh	f4879c31f936326c7e402139b7a5a5179467876f
@@ -88,9 +88,9 @@
   void require_working_copy(std::string const & explanation = "");
   void create_working_copy(system_path const & dir);
 
-  void app_state::set_restriction(path_set const & valid_paths, 
-                             std::vector<utf8> const & paths,
-                             bool respect_ignore = true);
+  void set_restriction(path_set const & valid_paths, 
+                       std::vector<utf8> const & paths,
+                       bool respect_ignore = true);
   bool restriction_includes(file_path const & path);
 
   // Set the branch name.  If you only invoke set_branch, the branch
============================================================
--- work.hh	b45b65da7ad181697e3b8fe482109e02fbd1ce34
+++ work.hh	a7d0ec4f02462a2562b5e9dca7d534b7fd81ddd6
@@ -56,7 +56,7 @@
   path_set & ignored;
   file_itemizer(app_state & a, path_set & k, path_set & u, path_set & i) 
     : app(a), known(k), unknown(u), ignored(i) {}
-  virtual void file_itemizer::visit_file(file_path const & path);
+  virtual void visit_file(file_path const & path);
 };
 
 void