summaryrefslogtreecommitdiff
path: root/library/imagecodecinterface.h
authorwaspe <waspe>2003-11-03 18:35:45 (UTC)
committer waspe <waspe>2003-11-03 18:35:45 (UTC)
commitc0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (patch) (side-by-side diff)
tree396acfe28669ac49037fef03d39f8c0e1d038562 /library/imagecodecinterface.h
parent3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (diff)
downloadopie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.zip
opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.gz
opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.bz2
reolved merge conflict
Diffstat (limited to 'library/imagecodecinterface.h') (more/less context) (show whitespace changes)
0 files changed, 0 insertions, 0 deletions