diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2013-10-28 06:45:27 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2013-10-28 06:45:27 +0000 |
| commit | b59e157e8c0f065caf96d9359e1ecab9512d05b4 (patch) | |
| tree | da882dc8bdbff8744c0bcf6a63fcdcee374979fb /camlibs/canon | |
| parent | d79c44017aed556bc0be5577127f0d1bc8f9b74c (diff) | |
| download | libgphoto2-b59e157e8c0f065caf96d9359e1ecab9512d05b4.tar.gz | |
From: Mark Eichin
S100 is also duplicated into the ptp2 driver, adjust name
http://sourceforge.net/p/gphoto/bugs/965/
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14578 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
| -rw-r--r-- | camlibs/canon/canon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 872c15a3c..d548d16c8 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -125,7 +125,7 @@ const struct canonCamModelData models[] = { /* 3042 is a scanner, so it will never be added here. */ {"Canon:PowerShot S20", CANON_CLASS_0, 0x04A9, 0x3043, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot S20"}, {"Canon:EOS D30", CANON_CLASS_4, 0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, - {"Canon:PowerShot S100", CANON_CLASS_0, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, + {"Canon:PowerShot S100 (2000)", CANON_CLASS_0, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, {"Canon:IXY DIGITAL", CANON_CLASS_0, 0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, {"Canon:Digital IXUS", CANON_CLASS_0, 0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot G1", CANON_CLASS_0, 0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, "Canon PowerShot G1"}, |