From 2be6e0842eeff9d3b12b9b7f05ab34b3903dba14 Mon Sep 17 00:00:00 2001 From: Scott Fritzinger Date: Thu, 7 Sep 2000 18:42:12 +0000 Subject: [PATCH] fixed conflicts git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1019 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/kodak/dc120/dc120.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c index c15f06d87..73bb797ca 100644 --- a/camlibs/kodak/dc120/dc120.c +++ b/camlibs/kodak/dc120/dc120.c @@ -301,6 +301,8 @@ int camera_summary (Camera *camera, CameraText *summary) { /* DC120Data *dd = camera->camlib_data; */ + strcpy(summary->text, "No summary information yet"); + return (GP_OK); }