Merge from http://moffetthome.net:8012/
authormpm@selenic.com
Fri, 24 Jun 2005 23:07:16 -0800
changeset 464 50da4bb9cab6
parent 462 512d76558bd4 (current diff)
parent 463 ea93402b81b9 (diff)
child 465 f8cb8d082d40
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-----
mercurial/bdiff.c
mercurial/commands.py
mercurial/mpatch.c
mercurial/util.py
mercurial/version.py
tests/test-copy
tests/test-copy.out
--- 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 {
--- 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.";