]> mj.ucw.cz Git - libucw.git/commit
Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
authorMartin Mares <mj@ucw.cz>
Sat, 25 Aug 2007 10:08:53 +0000 (12:08 +0200)
committerMartin Mares <mj@ucw.cz>
Sat, 25 Aug 2007 10:08:53 +0000 (12:08 +0200)
commite6f42d16d3278e709f23825944598769539368e5
tree3aa6847669f605ce7c7da4963964baa86bcf4e14
parentd18403664f23ca1464d659b29912758d72b2abec
parentb6b5b41d2b207088659f74b38dbcdc070f55f514
Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

Hand-merged:

  debug/Makefile
  lib/Makefile
  gather/shepherd/shep-select.c
lib/Makefile