fixed conflicts
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1019 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user