---
- branch: MAIN
  date: Thu Sep 23 11:03:36 UTC 2010
  files:
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/LICENSE
    pathrev: pkgsrc/archivers/bzip2/files/LICENSE@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/blocksort.c
    pathrev: pkgsrc/archivers/bzip2/files/blocksort.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzip2.1
    pathrev: pkgsrc/archivers/bzip2/files/bzip2.1@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzip2.c
    pathrev: pkgsrc/archivers/bzip2/files/bzip2.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzip2recover.c
    pathrev: pkgsrc/archivers/bzip2/files/bzip2recover.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzlib.c
    pathrev: pkgsrc/archivers/bzip2/files/bzlib.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzlib.h
    pathrev: pkgsrc/archivers/bzip2/files/bzlib.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/bzlib_private.h
    pathrev: pkgsrc/archivers/bzip2/files/bzlib_private.h@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/compress.c
    pathrev: pkgsrc/archivers/bzip2/files/compress.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/crctable.c
    pathrev: pkgsrc/archivers/bzip2/files/crctable.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/huffman.c
    pathrev: pkgsrc/archivers/bzip2/files/huffman.c@1.3
    type: modified
  - new: '1.3'
    old: '1.2'
    path: pkgsrc/archivers/bzip2/files/randtable.c
    pathrev: pkgsrc/archivers/bzip2/files/randtable.c@1.3
    type: modified
  id: 20100923T110336Z.7ec917da1e07b8604bde63ab658a4b919791cec4
  log: |
    Forcefully merge the branch back. This updates the included version
    numbers.
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/archivers/bzip2/files'
  unixtime: '1285239816'
  user: joerg