#
# patch "inodeprint.cc"
#  from [2c3777597d1f5b72231dfe46fcdb6ea32f2e4e36]
#    to [c96e97f83afb3dfad9cafaab8baf3595e7971698]
#
# patch "manifest.hh"
#  from [ec6b1d8eead43805502fb212e9756ddeacde822f]
#    to [2af22b3415d9ef59fbf687d1f2e3ae2bb6e38701]
#
# patch "revision.hh"
#  from [021b230b90385c16c5e9b802ea3890af0225d44c]
#    to [7a14bc821a3399957cf44fc6d983eafecf2034cf]
#
# patch "std_hooks.lua"
#  from [649e2df4de7cc5644bf6d96af6e0b1fd9e4ce12a]
#    to [a2a27daced7769d54850f059f39554cb1e0fc78d]
#
# patch "ui.cc"
#  from [e8e432ec66605abd34447c5c7f53259b39295169]
#    to [0fa61fa5c584e05a187d6c7e29c8336e4d7f3455]
#
# patch "win32/monotone.iss"
#  from [33ce25cb50cfe8baaf922bcc06f105a44be7a384]
#    to [224c8d4c628b371305a2f632ae72284094e56a6f]
#
========================================================================
--- inodeprint.cc	2c3777597d1f5b72231dfe46fcdb6ea32f2e4e36
+++ inodeprint.cc	c96e97f83afb3dfad9cafaab8baf3595e7971698
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <algorithm>
 #include <iterator>
+
 #include "app_state.hh"
 #include "manifest.hh"
 #include "inodeprint.hh"
========================================================================
--- manifest.hh	ec6b1d8eead43805502fb212e9756ddeacde822f
+++ manifest.hh	2af22b3415d9ef59fbf687d1f2e3ae2bb6e38701
@@ -77,8 +77,6 @@

 void extract_path_set(manifest_map const & man, path_set & paths);

-void extract_path_set(manifest_map const & man, path_set & paths);
-
 void classify_manifest_paths(app_state & app,
                              manifest_map const & man,
                              path_set & missing,
========================================================================
--- revision.hh	021b230b90385c16c5e9b802ea3890af0225d44c
+++ revision.hh	7a14bc821a3399957cf44fc6d983eafecf2034cf
@@ -44,6 +44,7 @@
 // patch "new-file.cc"
 //  from [95b50ede90037557fd0fbbfad6a9fdd67b0bf413]
 //    to [bd39086b9da776fc22abd45734836e8afb59c8c0]
+
 typedef std::map<revision_id, std::pair<manifest_id, boost::shared_ptr<change_set> > >
 edge_map;

========================================================================
--- std_hooks.lua	649e2df4de7cc5644bf6d96af6e0b1fd9e4ce12a
+++ std_hooks.lua	a2a27daced7769d54850f059f39554cb1e0fc78d
@@ -673,12 +673,6 @@
       return ("c:" .. str)
    end

-   -- something which looks like a generic cert pattern
-   if string.find(str, "^[^=]*=.*$")
-   then
-      return ("c:" .. str)
-   end
-
    -- something which looks like an email address
    if string.find(str, "address@hidden")
    then
========================================================================
--- ui.cc	e8e432ec66605abd34447c5c7f53259b39295169
+++ ui.cc	0fa61fa5c584e05a187d6c7e29c8336e4d7f3455
@@ -186,12 +186,7 @@
   clog << endl;
 }

-void tick_write_count::clear_line()
-{
-  clog << endl;
-}

-
 tick_write_dot::tick_write_dot()
 {
 }
@@ -262,12 +257,7 @@
   clog << endl;
 }

-void tick_write_dot::clear_line()
-{
-  clog << endl;
-}

-
 user_interface::user_interface() :
   last_write_was_a_tick(false),
   t_writer(0)
========================================================================
--- win32/monotone.iss	33ce25cb50cfe8baaf922bcc06f105a44be7a384
+++ win32/monotone.iss	224c8d4c628b371305a2f632ae72284094e56a6f
@@ -1,7 +1,7 @@
 [Setup]
 AppName=monotone
 AppVerName=monotone 0.23
-AppCopyright=Copyright  2002-2005 Graydon Hoare et al.
+AppCopyright=Copyright © 2002-2005 Graydon Hoare et al.
 DefaultDirName={pf}\monotone
 DefaultGroupName=monotone
 MinVersion=0,5.0