From 474ef7cdf787e0fc0ff36793fe1092bc7dae5fbc Mon Sep 17 00:00:00 2001 From: Theodore Kilgore Date: Thu, 29 Dec 2005 23:39:04 +0000 Subject: [PATCH] Added new camera DC-N130t git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8368 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/digigr8/library.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/camlibs/digigr8/library.c b/camlibs/digigr8/library.c index 0a5f2035d..efebe5964 100644 --- a/camlibs/digigr8/library.c +++ b/camlibs/digigr8/library.c @@ -56,12 +56,19 @@ struct { unsigned short idVendor; unsigned short idProduct; } models[] = { +<<<<<<< library.c + {"Digigr8", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, + {"Che-Ez Snap SNAP-U", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, + {"DC-N130t", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905C}, + {"Soundstar TDC-35", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, +======= {"Digigr8", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, {"Che-Ez Snap SNAP-U", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, {"Soundstar TDC-35", GP_DRIVER_STATUS_EXPERIMENTAL, 0x2770, 0x905c}, +>>>>>>> 1.2 {NULL,0,0,0} };