From 27ebdfb5c9b78436803e91fed85853cd6455cb17 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 4 Aug 2016 16:32:00 +0100 Subject: [PATCH 1/1] Preparation for minor version upgrade Change-Id: I72d2a872c60a3c53165fd7f960c670efecaf1f14 --- dali/public-api/actors/actor.h | 2 +- dali/public-api/rendering/renderer.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index 78f19d7..cbd4d8c 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -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 }; }; diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h index 353dd28..1a48391 100644 --- a/dali/public-api/rendering/renderer.h +++ b/dali/public-api/rendering/renderer.h @@ -424,6 +424,7 @@ public: /** * @brief name "batchingEnabled", type BOOLEAN + * @SINCE_1_2.0 * @see Batching * @note The default value is 'false' */ -- 2.7.4