9 files changed, 86 insertions, 195 deletions

diff --git a/xdelta3/ChangeLog b/xdelta3/ChangeLog
deleted file mode 100755
index d7bd042..0000000
--- a/xdelta3/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2006-07-02  Joshua MacDonald  <jmacd@google.com>
-
-        * xdelta3.c (xd3_iopt_flush_instructions): Fixed a bug in flush_instructions
-        clears more than half of the instructions, thus encodes the last two, which may
-        still overlap.
-
diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 6cac09e..34437e9 100755
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -1,8 +1,19 @@
-##
-PYTHON = python
-PYTGT = build/temp.linux-i686-2.3/xdelta3.so
-
-TARGETS = xdelta3 xdelta3-2 xdelta3-64 xdelta3-everything \
+# xdelta 3 - delta compression tools and library
+# Copyright (C) 2001, 2003, 2004, 2005, 2006.  Joshua P. MacDonald
+
+SOURCES = xdelta3-cfgs.h \
+          xdelta3-decode.h \
+          xdelta3-djw.h \
+          xdelta3-fgk.h \
+          xdelta3-list.h \
+          xdelta3-main.h \
+          xdelta3-python.h \
+          xdelta3-second.h \
+          xdelta3-test.h \
+          xdelta3.c \
+          xdelta3.h
+
+TARGETS = xdelta3 xdelta3-1 xdelta3-2 xdelta3-64 xdelta3-everything \
           xdelta3-Opg xdelta3-64-O xdelta3-Op xdelta3-O \
           xdelta3-decoder xdelta3-decoder-nomain.o \
           $(PYTGT) \
@@ -10,20 +21,23 @@ TARGETS = xdelta3 xdelta3-2 xdelta3-64 xdelta3-everything \
           xdelta3-noext xdelta3-tools xdelta3-tune \
           xdelta3-notools
 
-SOURCES = xdelta3.c xdelta3.h xdelta3-fgk.h xdelta3-djw.h xdelta3-list.h xdelta3-test.h \
-          xdelta3-main.h xdelta3-cfgs.h xdelta3-second.h xdelta3-python.h
+PYTHON = python
+PYTGT = build/temp.linux-i686-2.3/xdelta3.so
 
 PYFILES = xdelta3-regtest.py setup.py
 
-EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www RELEASE.NOTES
+EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www
 
-REL = 0f
+# $Format: "REL=$Xdelta3Version$" $
+REL=0g
 RELDIR = xdelta3$(REL)
 
-all: $(TARGETS)
+all: xdelta3
+
+all-targets: $(TARGETS)
 
 tar:
-        tar -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(PYFILES) $(EXTRA)
+        tar --exclude ".svn" -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(PYFILES) $(EXTRA)
         rm -rf /tmp/$(RELDIR)
         mkdir /tmp/$(RELDIR)
         (cd /tmp/$(RELDIR) && tar -xzf ../$(RELDIR)-tmp.tar.gz)
@@ -32,13 +46,22 @@ tar:
         rm -rf /tmp/$(RELDIR)
 
 clean:
-        rm -f $(TARGETS) xdtest.* core *.flc
+        rm -f $(TARGETS)
 
 $(PYTGT): $(SOURCES)
         $(PYTHON) setup.py install --compile --force
 
 xdelta3: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
+        $(CC) -O3 -Wall -Wshadow xdelta3.c -lm -o xdelta3 \
+              -DXD3_DEBUG=0 \
+              -DXD3_USE_LARGEFILE64=1 \
+              -DREGRESSION_TEST=1 \
+              -DSECONDARY_DJW=1 \
+              -DXD3_MAIN=1 \
+              -DXD3_POSIX=1
+
+xdelta3-1: $(SOURCES)
+        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-1 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
                 -DXD3_USE_LARGEFILE64=1 -DREGRESSION_TEST=1 -DXD3_DEBUG=1 -DSECONDARY_DJW=1 -lm
 
 xdelta3-2: $(SOURCES)
diff --git a/xdelta3/README b/xdelta3/README
new file mode 100755
index 0000000..b139f7e
--- /dev/null
+++ b/xdelta3/README
@@ -0,0 +1,7 @@
+For more information about xdelta3, see:
+
+file://www/xdelta3.html
+
+http://xdelta.org/
+
+http://code.google.com/p/xdelta/
diff --git a/xdelta3/RELEASE.NOTES b/xdelta3/RELEASE.NOTES
deleted file mode 100755
index a4af327..0000000
--- a/xdelta3/RELEASE.NOTES
+++ /dev/null
@@ -1,3 +0,0 @@
-2006-05-13  Joshua MacDonald  <joshua.macdonald@gmail.com>
-
-        * xdelta 3.0e: Performance and bug fixes.
diff --git a/xdelta3/releases/xdelta30g.tar.gz b/xdelta3/releases/xdelta30g.tar.gz
new file mode 100644
index 0000000..337da8f
--- /dev/null
+++ b/xdelta3/releases/xdelta30g.tar.gz
diff --git a/xdelta3/show.c b/xdelta3/show.c
deleted file mode 100755
index f53f2ca..0000000
--- a/xdelta3/show.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#define BUFSZ (1 << 22)
-
-int main(int argc, char **argv)
-{
-  int c;
-  int offset;
-  int bytes;
-
-  if (argc != 3)
-    {
-      fprintf (stderr, "usage: show offset bytes\n");
-      return 1;
-    }
-
-  offset = atoi (argv[1]);
-  bytes  = atoi (argv[2]);
-
-  for (; offset != 0; offset -= 1)
-    {
-      if ((c = fgetc (stdin)) == EOF)
-        {
-          fprintf (stderr, "EOF before offset\n");
-        }
-    }
-
-  for (; bytes != 0; bytes -= 1)
-    {
-      if ((c = fgetc (stdin)) == EOF)
-        {
-          fprintf (stderr, "\nEOF before offset + bytes\n");
-        }
-
-      fprintf (stderr, "%02x", c);
-    }
-
-  fprintf (stderr, "\n");
-  return 0;
-}
diff --git a/xdelta3/testh.c b/xdelta3/testh.c
deleted file mode 100755
index 1be01df..0000000
--- a/xdelta3/testh.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "xdelta3.h"
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 0fe848c..4a84e67 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -306,7 +306,8 @@ static int main_help (void);
 static int
 main_version (void)
 {
-  P(RINT "VERSION=3_PRERFC_0\n");
+  /* $Format: "  P(RINT \"VERSION=3.$Xdelta3Version$\\n\");" $ */
+  P(RINT "VERSION=3.0g\n");
   return EXIT_SUCCESS;
 }
 
@@ -314,31 +315,27 @@ static int
 main_config (void)
 {
   main_version ();
-  /* Compile-time */
-  P(RINT "VCDIFF_TOOLS=%d\n", VCDIFF_TOOLS);
-  P(RINT "REGRESSION_TEST=%d\n", REGRESSION_TEST);
-  P(RINT "SECONDARY_FGK=%d\n", SECONDARY_FGK);
-  P(RINT "SECONDARY_DJW=%d\n", SECONDARY_DJW);
+
+  P(RINT "EXTERNAL_COMPRESSION=%d\n", EXTERNAL_COMPRESSION);
   P(RINT "GENERIC_ENCODE_TABLES=%d\n", GENERIC_ENCODE_TABLES);
   P(RINT "GENERIC_ENCODE_TABLES_COMPUTE=%d\n", GENERIC_ENCODE_TABLES_COMPUTE);
-  P(RINT "EXTERNAL_COMPRESSION=%d\n", EXTERNAL_COMPRESSION);
-  P(RINT "XD3_POSIX=%d\n", XD3_POSIX);
-  P(RINT "XD3_DEBUG=%d\n", XD3_DEBUG);
-  P(RINT "XD3_USE_LARGEFILE64=%d\n", XD3_USE_LARGEFILE64);
-  P(RINT "XD3_ENCODER=%d\n", XD3_ENCODER);
-
-  /* Runtime sizes/command-line */
-  P(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE);
-  P(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ);
-  P(RINT "XD3_DEFAULT_MEMSIZE=%d\n", XD3_DEFAULT_MEMSIZE);
-
-  /* TODO: the following cannot be set by command-line */
+  P(RINT "REGRESSION_TEST=%d\n", REGRESSION_TEST);
+  P(RINT "SECONDARY_DJW=%d\n", SECONDARY_DJW);
+  P(RINT "SECONDARY_FGK=%d\n", SECONDARY_FGK);
+  P(RINT "VCDIFF_TOOLS=%d\n", VCDIFF_TOOLS);
   P(RINT "XD3_ALLOCSIZE=%d\n", XD3_ALLOCSIZE);
+  P(RINT "XD3_DEBUG=%d\n", XD3_DEBUG);
   P(RINT "XD3_DEFAULT_CKSUM_SIZE=%d\n", XD3_DEFAULT_CKSUM_ADVANCE);
   P(RINT "XD3_DEFAULT_IOPT_SIZE=%d\n", XD3_DEFAULT_IOPT_SIZE);
+  P(RINT "XD3_DEFAULT_MEMSIZE=%d\n", XD3_DEFAULT_MEMSIZE);
   P(RINT "XD3_DEFAULT_SPREVSZ=%d\n", XD3_DEFAULT_SPREVSZ);
+  P(RINT "XD3_DEFAULT_SRCWINSZ=%d\n", XD3_DEFAULT_SRCWINSZ);
+  P(RINT "XD3_DEFAULT_WINSIZE=%d\n", XD3_DEFAULT_WINSIZE);
+  P(RINT "XD3_ENCODER=%d\n", XD3_ENCODER);
   P(RINT "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE);
   P(RINT "XD3_NODECOMPRESSSIZE=%d\n", XD3_NODECOMPRESSSIZE);
+  P(RINT "XD3_POSIX=%d\n", XD3_POSIX);
+  P(RINT "XD3_USE_LARGEFILE64=%d\n", XD3_USE_LARGEFILE64);
 
   return EXIT_SUCCESS;
 }
@@ -2213,7 +2210,8 @@ main_input (xd3_cmd     cmd,
   option_srcwinsz = max(option_srcwinsz, XD3_ALLOCSIZE);
   option_winsize = max(option_winsize, XD3_ALLOCSIZE);
 
-  source.blksize = max(XD3_DEFAULT_WINSIZE, option_srcwinsz / 32);
+  source.blksize = (option_srcwinsz / 32) & ~(XD3_ALLOCSIZE-1);
+  source.blksize = max(XD3_DEFAULT_WINSIZE, source.blksize);
 
   config.srcwin_maxsz = option_srcwinsz;
   config.winsize = option_winsize;
@@ -2552,6 +2550,10 @@ main (int argc, char **argv)
   char **orig_argv = argv;
   int ret;
 
+  main_file_init (& ifile);
+  main_file_init (& ofile);
+  main_file_init (& sfile);
+
  go:  /* Go. */
   cmd = CMD_NONE;
   sfilename = NULL;
@@ -2816,10 +2818,6 @@ main (int argc, char **argv)
       XPR(NT "command line: %s\n", buf);
     }      
 
-  main_file_init (& ifile);
-  main_file_init (& ofile);
-  main_file_init (& sfile);
-
   ifile.flags    = RD_FIRST;
   sfile.flags    = RD_FIRST;
   sfile.filename = option_source_filename;
@@ -2930,7 +2928,7 @@ main_help (void)
   P(RINT "   -0 .. -9     compression level\n");
   P(RINT "   -A [apphead] disable/provide application header\n");
   P(RINT "   -B blksize   source file block size\n");
-  P(RINT "   -C           soft config (see code)\n");
+  P(RINT "   -C           soft config (see xdelta3-cfgs.h)\n");
   P(RINT "   -c           use stdout instead of default\n");
   P(RINT "   -D           disable external decompression (encode/decode)\n");
   P(RINT "   -d           same as decode command\n");
@@ -2946,7 +2944,7 @@ main_help (void)
   P(RINT "   -R           disable external recompression (decode)\n");
   P(RINT "   -S [djw|fgk] disable/enable secondary compression\n");
   P(RINT "   -s source    source file to copy from (if any)\n");
-  P(RINT "   -T           use alternate code table (compatibility testing)\n");
+  P(RINT "   -T           use alternate code table\n");
   P(RINT "   -v           be verbose (max 2)\n");
   P(RINT "   -V           show version\n");
   P(RINT "   -W winsize   input window buffer size\n");
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index df1a445..02a254d 100755
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -4,130 +4,44 @@
 (Project-Version xdelta3 0 5)
 (Parent-Version xdelta3 0 4)
 (Version-Log "write a bit of documentation, work to fix/clean the regression test, fixed one actual bug in xd3_stream_close()")
-(New-Version-Log "")
+(New-Version-Log "update .prj after 2 years! see http://code.google.com/p/xdelta/")
 (Checkin-Time "Sun, 30 May 2004 14:42:47 -0700")
 (Checkin-Login jmacd)
 (Populate-Ignore ())
 (Project-Keywords
+ (Xdelta3Version "0g")
  (WWWLeftNavBar "<table cellpadding=\"20px\" width=700> <tr> <td class=\"leftbdr\" valign=top height=600 width=100> <div class=\"leftbody\"> <h1>Xdelta</h1> <a href=\"xdelta3.html\">overview</a><br> <a href=\"xdelta3-cmdline.html\">command&nbsp;line</a><br> <a href=\"xdelta3-api-guide.html\">api&nbsp;guide</a><br> <br><a href=\"http://xdelta.org\">xdelta.org</a></h2> </div> </td> <td valign=top width=500>")
  )
 (Files
+  (COPYING ())
 
-;; Files added by populate at Sun, 20 Jul 2003 04:22:04 +0400,
-;; to version 0.0(w), by jmacd:
-
-  (Makefile (xdelta3/0_Makefile 1.3 644))
-  (xdelta3.h (xdelta3/1_xdelta3.h 1.2 644))
-  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.2 644))
-  (xdelta3-second.h (xdelta3/3_xdelta3-se 1.1 644))
-  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.1 644))
-  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.3 644))
-  (xdelta3-list.h (xdelta3/6_xdelta3-li 1.1 644))
-  (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.1 644))
-  (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.1 644))
   (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.1 644))
+  (xdelta3-decode.h ())
+  (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.1 644))
+  (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.1 644))
+  (xdelta3-list.h (xdelta3/6_xdelta3-li 1.1 644))
+  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.3 644))
+  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.1 644))
   (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.3 755))
-  (setup.py (xdelta3/11_setup.py 1.1 644))
-  (analyze_pfx.py (xdelta3/12_analyze_pf 1.1 644))
-  (analyze_gp.py (xdelta3/13_analyze_gp 1.1 644))
-  (analyze_clen.py (xdelta3/14_analyze_cl 1.1 644))
-  (rcs_junk.cc (xdelta3/15_rcs_junk.c 1.1 644))
+  (xdelta3-second.h (xdelta3/3_xdelta3-se 1.1 644))
+  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.2 644))
   (xdelta3.c (xdelta3/16_xdelta3.c 1.3 644))
-  (testh.c (xdelta3/17_testh.c 1.1 644))
-  (show.c (xdelta3/18_show.c 1.1 644))
-  (linkxd3lib.c (xdelta3/19_linkxd3lib 1.1 644))
-  (badcopy.c (xdelta3/20_badcopy.c 1.1 644))
-
-;; Files added by populate at Sun, 20 Jul 2003 04:22:08 +0400,
-;; to version 0.0(w), by jmacd:
-
-  (save.regtest.bug9/foo,v (xdelta3/21_foo,vx 1.1 444) :no-keywords)
-  (save.regtest.bug9/foo2,v (xdelta3/22_foo2,vx 1.1 444) :no-keywords)
-  (save.regtest.bug8/core (xdelta3/23_core 1.1 600) :no-keywords)
-  (save.regtest.bug8/output.x.right (xdelta3/24_output.x.r 1.1 644) :no-keywords)
-  (save.regtest.bug8/output.x (xdelta3/25_output.x 1.1 644) :no-keywords)
-  (save.regtest.bug8/input.1.xz (xdelta3/26_input.1.xz 1.1 644) :no-keywords)
-  (save.regtest.bug8/input.0.xz (xdelta3/27_input.0.xz 1.1 644) :no-keywords)
-  (save.regtest.bug8/input.0 (xdelta3/28_input.0 1.1 644))
-  (save.regtest.bug8/input.1 (xdelta3/29_input.1 1.1 644))
-  (save.regtest.bug7/core (xdelta3/30_core 1.1 600) :no-keywords)
-  (save.regtest.bug7/recon.x (xdelta3/31_recon.x 1.1 644) :no-keywords)
-  (save.regtest.bug7/output.x (xdelta3/32_output.x 1.1 644) :no-keywords)
-  (save.regtest.bug7/input.1 (xdelta3/33_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug7/input.0 (xdelta3/34_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug7/output (xdelta3/35_output 1.1 644) :no-keywords)
-  (save.regtest.bug7/recon (xdelta3/36_recon 1.1 644) :no-keywords)
-  (save.regtest.bug6/recon (xdelta3/37_recon 1.1 644))
-  (save.regtest.bug6/input.21 (xdelta3/38_input.21 1.1 644))
-  (save.regtest.bug6/input.20 (xdelta3/39_input.20 1.1 644))
-  (save.regtest.bug6/input.0 (xdelta3/40_input.0 1.1 644))
-  (save.regtest.bug6/output (xdelta3/41_output 1.1 644) :no-keywords)
-  (save.regtest.bug5/input.1 (xdelta3/42_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug5/input.0 (xdelta3/43_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug4/input.1 (xdelta3/44_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug4/input.0 (xdelta3/45_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug3/input.1 (xdelta3/46_input.1 1.1 644))
-  (save.regtest.bug3/input.0 (xdelta3/47_input.0 1.1 644))
-  (save.regtest.bug2/input.1 (xdelta3/48_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug2/input.0 (xdelta3/49_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug12/xd3regtest.27181/input.1 (xdelta3/50_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug12/xd3regtest.27181/input.0 (xdelta3/51_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug12/xd3regtest.27181/output (xdelta3/b/0_output 1.1 644) :no-keywords)
-  (save.regtest.bug12/output.x (xdelta3/b/1_output.x 1.1 644) :no-keywords)
-  (save.regtest.bug12/input.1 (xdelta3/b/2_input.1 1.1 644))
-  (save.regtest.bug12/input.0 (xdelta3/b/3_input.0 1.1 644))
-  (save.regtest.bug12/output (xdelta3/b/4_output 1.1 644) :no-keywords)
-  (save.regtest.bug11/recon.x (xdelta3/b/5_recon.x 1.1 644))
-  (save.regtest.bug11/output.x (xdelta3/b/6_output.x 1.1 644) :no-keywords)
-  (save.regtest.bug11/input.1 (xdelta3/b/7_input.1 1.1 644))
-  (save.regtest.bug11/input.0 (xdelta3/b/8_input.0 1.1 644))
-  (save.regtest.bug11/output (xdelta3/b/9_output 1.1 644) :no-keywords)
-  (save.regtest.bug11/recon (xdelta3/b/10_recon 1.1 644))
-  (save.regtest.bug10/recon.x (xdelta3/b/11_recon.x 1.1 644) :no-keywords)
-  (save.regtest.bug10/output.x (xdelta3/b/12_output.x 1.1 644) :no-keywords)
-  (save.regtest.bug10/input.1 (xdelta3/b/13_input.1 1.1 644) :no-keywords)
-  (save.regtest.bug10/input.0 (xdelta3/b/14_input.0 1.1 644) :no-keywords)
-  (save.regtest.bug10/output (xdelta3/b/15_output 1.1 644) :no-keywords)
-  (save.regtest.bug1/input.4 (xdelta3/b/16_input.4 1.1 644))
-  (save.regtest.bug1/input.5 (xdelta3/b/17_input.5 1.1 644))
-
-;; Files added by populate at Sun, 20 Jul 2003 04:22:28 +0400,
-;; to version 0.0(w), by jmacd:
-
-  (priorities.txt (xdelta3/b/18_priorities 1.1 644))
-
-;; Files added by populate at Sun, 20 Jul 2003 04:22:40 +0400,
-;; to version 0.0(w), by jmacd:
-
-  (vcdiff.ps (xdelta3/b/19_vcdiff.ps 1.1 644))
-  (draft-vcdiff-huffman.txt (xdelta3/b/20_draft-vcdi 1.1 600))
-
-;; Files added by populate at Sun, 20 Jul 2003 04:22:59 +0400,
-;; to version 0.0(w), by jmacd:
-
-  (dead.code (xdelta3/b/21_dead.code 1.2 644))
+  (xdelta3.h (xdelta3/1_xdelta3.h 1.2 644))
 
-;; Files added by populate at Sun, 20 Jul 2003 04:23:05 +0400,
-;; to version 0.0(w), by jmacd:
+  (Makefile (xdelta3/0_Makefile 1.3 644))
+  (setup.py (xdelta3/11_setup.py 1.1 644))
 
   (draft-korn-vcdiff.txt (xdelta3/b/22_draft-korn 1.1 600))
-
-;; Files added by populate at Sun, 20 Jul 2003 08:16:41 +0400,
-;; to version 0.1(w), by jmacd:
-
   (www/xdelta3-api-guide.html (xdelta3/b/23_Xdelta3-ap 1.4 644))
-  (www/xdelta3.html (xdelta3/b/24_Xdelta3.ht 1.4 644))
-
-;; Files added by populate at Sun, 20 Jul 2003 22:35:48 +0400,
-;; to version 0.2(w), by jmacd:
-
   (www/xdelta3-cmdline.html (xdelta3/b/25_xdelta3-cm 1.2 644))
   (www/xdelta3.css (xdelta3/b/26_xdelta3.cs 1.3 644))
+  (www/xdelta3.html (xdelta3/b/24_Xdelta3.ht 1.4 644))
 
-;; Files added by populate at Wed, 21 Jul 2004 15:39:04 -0700,
-;; to version 0.5(w), by jmacd:
-
-  (gpl.txt ())
+  (badcopy.c (xdelta3/20_badcopy.c 1.1 644))
+  (junk.py ())
+  (linkxd3lib.c (xdelta3/19_linkxd3lib 1.1 644))
+  (rcs_junk.cc (xdelta3/15_rcs_junk.c 1.1 644))
+  (show.c (xdelta3/18_show.c 1.1 644))
 )
 (Merge-Parents)
 (New-Merge-Parents)