Preparation for minor version upgrade 35/82635/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Aug 2016 15:32:00 +0000 (16:32 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 4 Aug 2016 15:32:00 +0000 (16:32 +0100)
Change-Id: I72d2a872c60a3c53165fd7f960c670efecaf1f14

dali/public-api/actors/actor.h
dali/public-api/rendering/renderer.h

index 78f19d7..cbd4d8c 100644 (file)
@@ -308,7 +308,7 @@ public:
       MINIMUM_SIZE,                                       ///< name "minimumSize",           type Vector2 @SINCE_1_0.0
       MAXIMUM_SIZE,                                       ///< name "maximumSize",           type Vector2 @SINCE_1_0.0
       INHERIT_POSITION,                                   ///< name "inheritPosition",       type bool @SINCE_1_1.24
-      BATCH_PARENT,                                       ///< name "batchParent",           type bool @SINCE_1_1.46
+      BATCH_PARENT,                                       ///< name "batchParent",           type bool @SINCE_1_2.0
     };
   };
 
index 353dd28..1a48391 100644 (file)
@@ -424,6 +424,7 @@ public:
 
       /**
        * @brief name "batchingEnabled", type BOOLEAN
+       * @SINCE_1_2.0
        * @see Batching
        * @note The default value is 'false'
        */