]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a996044 887aca5)
Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git
authorMartin Mares <mj@ucw.cz>
Mon, 18 Dec 2006 13:29:40 +0000 (14:29 +0100)
committerMartin Mares <mj@ucw.cz>
Mon, 18 Dec 2006 13:29:40 +0000 (14:29 +0100)
(Incorporated all changes from dev-async-shep, v3.10 and v3.9 through
mainline. All merging went smoothly except for lib/threads.c.)

1  2 
lib/threads.c patch | diff1 | diff2 | blob | history

diff --cc lib/threads.c
Simple merge
UCW libraries