summaryrefslogtreecommitdiff
path: root/generators.c
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2008-08-10 14:34:24 +0200
committerTomas Bzatek <tbzatek@users.sourceforge.net>2008-08-10 14:34:24 +0200
commit7f74efd63d8026e1d11d33aa9f3b236127bb89dc (patch)
tree40e80988a94a5d65fdd8f7e55fd8658141f0edc1 /generators.c
parent3462576fd6bc883c41042fb7ae93ebabb12718d8 (diff)
parent1792a2cb2349cb8ba8273aea4b3a6ed52e80e149 (diff)
downloadcataract-7f74efd63d8026e1d11d33aa9f3b236127bb89dc.tar.xz
Merge branch 'master' of ssh://staflik/projects/git/cataract
Conflicts: jpeg-utils.cpp
Diffstat (limited to 'generators.c')
0 files changed, 0 insertions, 0 deletions