Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / lib / elm_photo.h

diff --git a/src/lib/elm_photo.h b/src/lib/elm_photo.h
index 9228c23..c264a97 100644 (file)
--- a/src/lib/elm_photo.h
+++ b/src/lib/elm_photo.h
@@ -1,14 +1,23 @@
 /**
  * @defgroup Photo Photo
  *
+<<<<<<< HEAD
+ * For displaying the photo of a person (contact). Simple, yet
+=======
  * For displaying a photo, for ex., a person (contact). Simple, yet
+>>>>>>> remotes/origin/upstream
  * with a very specific purpose.
  *
  * Signals that you can add callbacks for are:
  *
  * "clicked" - This is called when a user has clicked the photo
+<<<<<<< HEAD
+ * "drag,start" - Someone started dragging the image out of the object
+ * "drag,end" - Dragged item was dropped (somewhere)
+=======
  * "drag,start" - dragging the image out of the photo object
  * "drag,end" - Drop the dragged item  
+>>>>>>> remotes/origin/upstream
  *
  * @{
  */
@@ -39,7 +48,11 @@ EAPI Eina_Bool elm_photo_file_set(Evas_Object *obj, const char *file);
  * Set the file that will be used as thumbnail in the photo.
  *
  * @param obj The photo object.
+<<<<<<< HEAD
+ * @param file The path to file that will be used as thumb.
+=======
  * @param file The path to file that will be used as thumbnail.
+>>>>>>> remotes/origin/upstream
  * @param group The key used in case of an EET file.
  *
  * @ingroup Photo
@@ -50,7 +63,11 @@ EAPI void      elm_photo_thumb_set(const Evas_Object *obj, const char *file, con
  * Set the size that will be used on the photo
  *
  * @param obj The photo object
+<<<<<<< HEAD
+ * @param size The size that the photo will be
+=======
  * @param size The size of the photo
+>>>>>>> remotes/origin/upstream
  *
  * @ingroup Photo
  */
@@ -74,7 +91,11 @@ EAPI void      elm_photo_fill_inside_set(Evas_Object *obj, Eina_Bool fill);
  * the image will delete the existing content.
  *
  * @param obj The photo object.
+<<<<<<< HEAD
+ * @param set To set of clear editablity.
+=======
  * @param set To set of clear editability.
+>>>>>>> remotes/origin/upstream
  */
 EAPI void      elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
 
@@ -97,7 +118,11 @@ EAPI void      elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
 EAPI void             elm_photo_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
 
 /**
+<<<<<<< HEAD
+ * Get if the object fixes the original aspect ratio.
+=======
  * Get if the object keeps the original aspect ratio.
+>>>>>>> remotes/origin/upstream
  *
  * @param obj The photo object.
  * @return @c EINA_TRUE if the object keeps the original aspect, @c EINA_FALSE