From: Martin Mares Date: Tue, 11 Apr 2006 08:57:37 +0000 (+0200) Subject: Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.8 X-Git-Tag: holmes-import~650^2~10^2~4 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=11902e0b6fc1d043da0abadcdd928b247b071ccf;p=libucw.git Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.8 The image weighting backports in v3.8 have created some conflicts due to formatting changes, so I have kept the mainline versions everywhere. Weights were inherited from v3.8 except for IP and CK[WP]A. --- 11902e0b6fc1d043da0abadcdd928b247b071ccf