]> mj.ucw.cz Git - libucw.git/commitdiff
Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.10
authorPavel Charvat <pavel.charvat@netcentrum.cz>
Mon, 27 Nov 2006 23:50:00 +0000 (00:50 +0100)
committerPavel Charvat <pavel.charvat@netcentrum.cz>
Mon, 27 Nov 2006 23:50:00 +0000 (00:50 +0100)
1  2 
images/io-libjpeg.c

Simple merge