]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7dad1a e2febdf)
Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-config
authorMartin Mares <mj@ucw.cz>
Tue, 25 Apr 2006 21:47:15 +0000 (23:47 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 25 Apr 2006 21:47:15 +0000 (23:47 +0200)
1  2 
lib/conf2.c patch | diff1 | diff2 | blob | history

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