---
- branch: MAIN
  date: Mon Feb  1 14:39:21 UTC 2010
  files:
  - new: '1.8'
    old: '1.7'
    path: pkgsrc/wm/obconf/distinfo
    pathrev: pkgsrc/wm/obconf/distinfo@1.8
    type: modified
  - new: '1.2'
    old: '1.1'
    path: pkgsrc/wm/obconf/patches/patch-ab
    pathrev: pkgsrc/wm/obconf/patches/patch-ab@1.2
    type: modified
  id: 20100201T143921Z.8630f1e6d06e57a07419df9a49dc7d469139a326
  log: "fix mis-merge\n"
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/wm/obconf'
  unixtime: '1265035161'
  user: tnn