]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 127fe71 db8ca49)
Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-config
authorRobert Spalek <robert@ucw.cz>
Tue, 25 Apr 2006 21:29:35 +0000 (23:29 +0200)
committerRobert Spalek <robert@ucw.cz>
Tue, 25 Apr 2006 21:29:35 +0000 (23:29 +0200)
1  2 
lib/conf2.c patch | diff1 | diff2 | blob | history

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