#
# patch "AUTHORS"
#  from [87280bb53f20b5ca61ac381fec148f622f4af4e5]
#    to [439b592907209a2735f17fbb8e700f8a712dcad2]
#
# patch "ChangeLog"
#  from [a0e257ab7dfbc5a7d1b620f68104b917ed617e02]
#    to [f6446003e4e0c79f9e01a66ece2624dceaf02919]
#
# patch "Makefile.am"
#  from [584c7ff1a014826d5337ce75fddc159ab06748f0]
#    to [64db7755181fa3ecb022fc457885ca676bc2d903]
#
# patch "unix/process.cc"
#  from [54451d804bccb182c535c67bf1722ecd78a4a1d8]
#    to [2d952838b067e002206f6a67999534a3e1143218]
#
========================================================================
--- AUTHORS	87280bb53f20b5ca61ac381fec148f622f4af4e5
+++ AUTHORS	439b592907209a2735f17fbb8e700f8a712dcad2
@@ -46,7 +46,7 @@
   Christian Kollee <address@hidden>
   Faheem Mitha <address@hidden>
   Neil Conway <address@hidden>
-  Wojciech Miłkowski <address@hidden>
+  Wojciech Miłkowski <address@hidden>
   Georg-W. Koltermann <address@hidden>
   Daniel Berlin <address@hidden>
   Jon Bright <address@hidden>
@@ -250,7 +250,7 @@
 It's reproduced in popt/COPYING.


-The file contrib/colorize is a copy of a perl script written by Cédric
+The file contrib/colorize is a copy of a perl script written by Cédric
 Bouvier, which is released under the GNU GPL.


========================================================================
--- ChangeLog	a0e257ab7dfbc5a7d1b620f68104b917ed617e02
+++ ChangeLog	f6446003e4e0c79f9e01a66ece2624dceaf02919
@@ -8574,7 +8574,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.

========================================================================
--- Makefile.am	584c7ff1a014826d5337ce75fddc159ab06748f0
+++ Makefile.am	64db7755181fa3ecb022fc457885ca676bc2d903
@@ -51,7 +51,6 @@
 	 netio.hh smap.hh gettext.h					\
          package_revision.c package_revision.h				\
          package_full_revision.c package_full_revision.h options.hh     \
-         format.cc format.hh                                            \
          i18n.h hash_map.hh

 NETXX_SOURCES =									\
========================================================================
--- unix/process.cc	54451d804bccb182c535c67bf1722ecd78a4a1d8
+++ unix/process.cc	2d952838b067e002206f6a67999534a3e1143218
@@ -121,8 +121,3 @@
 {
         return getpid();
 }
-
-pid_t get_process_id()
-{
-  return getpid();
-}