]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebc7161 c194796)
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)
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.


Trivial merge
UCW libraries