]> mj.ucw.cz Git - libucw.git/commit
Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.8
authorMartin Mares <mj@ucw.cz>
Tue, 11 Apr 2006 08:57:37 +0000 (10:57 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 11 Apr 2006 08:57:37 +0000 (10:57 +0200)
commit11902e0b6fc1d043da0abadcdd928b247b071ccf
tree7a5a8dd415516b5be55fc3d8fa26a1a76ea8547e
parentebc7161da51f83c7255c09fd74316433bc82dcab
parentc194796a1a16b7a67faca6f00e8058137d17ba77
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.