cvs commit: src/lib/libz adler32.c compress.c crc32.c deflate.c deflate.h example.c gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inflate.c inftrees.c infutil.c infutil.h maketree.c minigzip.c trees.c uncompr.c zconf.h zlib.3 zutil.c ...

[Tim J. Robbins]

tjr         2004-06-30 23:54:47 UTC

  FreeBSD src repository

  Modified files:
    lib/libz             adler32.c compress.c crc32.c deflate.c 
                         deflate.h example.c gzio.c inffast.c 
                         inflate.c inftrees.c minigzip.c trees.c 
                         uncompr.c zconf.h zlib.3 zutil.c zutil.h 
  Removed files:
    lib/libz             infblock.c infblock.h infcodes.c 
                         infcodes.h infutil.c infutil.h maketree.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes     Path
  1.8       +35 -9      src/lib/libz/adler32.c
  1.8       +13 -2      src/lib/libz/compress.c
  1.8       +254 -105   src/lib/libz/crc32.c
  1.8       +328 -176   src/lib/libz/deflate.c
  1.7       +16 -8      src/lib/libz/deflate.h
  1.8       +75 -64     src/lib/libz/example.c
  1.10      +328 -197   src/lib/libz/gzio.c
  1.5       +0 -406     src/lib/libz/infblock.c (dead)
  1.2       +0 -37      src/lib/libz/infblock.h (dead)
  1.5       +0 -259     src/lib/libz/infcodes.c (dead)
  1.2       +0 -27      src/lib/libz/infcodes.h (dead)
  1.4       +293 -171   src/lib/libz/inffast.c
  1.4       +1242 -338  src/lib/libz/inflate.c
  1.4       +288 -421   src/lib/libz/inftrees.c
  1.4       +0 -90      src/lib/libz/infutil.c (dead)
  1.2       +0 -99      src/lib/libz/infutil.h (dead)
  1.4       +0 -88      src/lib/libz/maketree.c (dead)
  1.14      +17 -15     src/lib/libz/minigzip.c
  1.8       +49 -48     src/lib/libz/trees.c
  1.8       +7 -4       src/lib/libz/uncompr.c
  1.8       +154 -109   src/lib/libz/zconf.h
  1.7       +79 -28     src/lib/libz/zlib.3
  1.8       +106 -12    src/lib/libz/zutil.c
  1.7       +65 -27     src/lib/libz/zutil.h