# HG changeset patch
# User mpm@selenic.com
# Date 1119683236 28800
# Node ID 50da4bb9cab6c78f04fdb3d6fa8906ced445b3d2
# Parent  512d76558bd4affd57ec78e4ad482ccdd4a2fa3f# Parent  ea93402b81b93bd7980269500016627be7a8eecc
Merge from http://moffetthome.net:8012/

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Merge from http://moffetthome.net:8012/

manifest hash: 3a67864af6b0276eabe640274633ca2625dbd4a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCvQKkywK+sNU5EO8RArUHAKCSGtpEfJwYGoAIpj4mBDvcPted9wCgnzML
xr8WQ8DdPkJ9DVsLjvsbhJU=
=O7Fd
-----END PGP SIGNATURE-----


diff -r 512d76558bd4 -r 50da4bb9cab6 mercurial/bdiff.c
--- a/mercurial/bdiff.c	Fri Jun 24 23:00:19 2005 -0800
+++ b/mercurial/bdiff.c	Fri Jun 24 23:07:16 2005 -0800
@@ -27,6 +27,7 @@
 #else
   #include <netinet/in.h>
   #include <sys/types.h>
+  #include <stdint.h>
 #endif
 
 struct line {
diff -r 512d76558bd4 -r 50da4bb9cab6 mercurial/commands.py
diff -r 512d76558bd4 -r 50da4bb9cab6 mercurial/mpatch.c
--- a/mercurial/mpatch.c	Fri Jun 24 23:00:19 2005 -0800
+++ b/mercurial/mpatch.c	Fri Jun 24 23:07:16 2005 -0800
@@ -38,6 +38,7 @@
 #else
   #include <netinet/in.h>
   #include <sys/types.h>
+  #include <stdint.h>
 #endif
 
 static char mpatch_doc[] = "Efficient binary patching.";
diff -r 512d76558bd4 -r 50da4bb9cab6 mercurial/util.py
diff -r 512d76558bd4 -r 50da4bb9cab6 mercurial/version.py
diff -r 512d76558bd4 -r 50da4bb9cab6 tests/test-copy
diff -r 512d76558bd4 -r 50da4bb9cab6 tests/test-copy.out