summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2012-01-13 19:38:58 +0000
committerMarcus Meissner <marcus@jet.franken.de>2012-01-13 19:38:58 +0000
commita5369e9b449c428bbd42fb93c8a4e6485fff936b (patch)
tree3f6db97ee247a31d4f5886887f230455614f193c
parentbbadfafbe20d278d7926a84a455fa2bbb0b7ef56 (diff)
downloadlibgphoto2-a5369e9b449c428bbd42fb93c8a4e6485fff936b.tar.gz
merged from trunk
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13834 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--camlibs/jl2005c/ChangeLog10
-rw-r--r--camlibs/jl2005c/library.c6
2 files changed, 16 insertions, 0 deletions
diff --git a/camlibs/jl2005c/ChangeLog b/camlibs/jl2005c/ChangeLog
index b17221178..3fb7a76e9 100644
--- a/camlibs/jl2005c/ChangeLog
+++ b/camlibs/jl2005c/ChangeLog
@@ -1,3 +1,13 @@
+2012-01-12 Theodore Kilgore <kilgota@auburn.edu>
+ * library.c: Jazwares Star Wars camera added.
+
+2011-06-20 Theodore Kilgore <kilgota@auburn.edu>
+ * library.c: Sakar 88067 Dora the Explorer camera added.
+
+2010-04-28 Theodore Kilgore <kilgota@auburn.edu>
+ * README.jl2005c: minor cleanup.
+ * library.c: Sakar 88601 Nickelodeon iCarly camera added.
+
2010-12-26 Marcus Meissner <marcus@jet.franken.de>
* jl2005bcd_decompress.c: Dynamically allocate the out and
diff --git a/camlibs/jl2005c/library.c b/camlibs/jl2005c/library.c
index 76e9b6e2d..76296acb4 100644
--- a/camlibs/jl2005c/library.c
+++ b/camlibs/jl2005c/library.c
@@ -60,6 +60,10 @@ struct {
{"Aries ATC-0017", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0227},
{"Sakar no. 75379", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0227},
{"Sakar no. 81890", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0227},
+ {"Sakar Nickelodeon iCarly no. 88061", GP_DRIVER_STATUS_EXPERIMENTAL,
+ 0x0979, 0x0227},
+ {"Sakar Dora the Explorer no. 88067", GP_DRIVER_STATUS_EXPERIMENTAL,
+ 0x0979, 0x0227},
{"Sakar no. 91379", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0227},
{"Sakar no. 98379", GP_DRIVER_STATUS_EXPERIMENTAL, 0x0979, 0x0227},
{"Sakar Kidz-Cam no. 88379", GP_DRIVER_STATUS_EXPERIMENTAL,
@@ -70,6 +74,8 @@ struct {
0x0979, 0x0227},
{"Sakar Star Wars kit no. 92022", GP_DRIVER_STATUS_EXPERIMENTAL,
0x0979, 0x0227},
+ {"Jazwares Star Wars no. 15256", GP_DRIVER_STATUS_EXPERIMENTAL,
+ 0x0979, 0x0227},
{"Argus Bean Sprout", GP_DRIVER_STATUS_EXPERIMENTAL,
0x0979, 0x0227},
{"Global Point Clipster", GP_DRIVER_STATUS_EXPERIMENTAL,