From: Tom Robinson <tom.robinson@samsung.com>
Date: Mon, 17 Oct 2016 14:54:30 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/new_vr
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e54ce004c50f11d39f116eb4e8461ce9a4ab6243;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Merge branch 'devel/master' into devel/new_vr

Change-Id: Ib4c065e28a3303222308b0791e09d5e999caa049
---

e54ce004c50f11d39f116eb4e8461ce9a4ab6243
diff --cc dali/internal/update/manager/update-manager.h
index 660bce0,6b153fa..dd49678
--- a/dali/internal/update/manager/update-manager.h
+++ b/dali/internal/update/manager/update-manager.h
@@@ -106,8 -106,7 +106,8 @@@ public
     * @param[in] renderQueue Used to queue messages for the next render.
     * @param[in] textureCacheDispatcher Used for sending messages to texture cache.
     * @param[in] geometryBatcher Used when geometry batching is enabled.
--   * @param[in] renderTaskProcessor Handles RenderTasks and RenderInstrucitons.
++   * @param[in] renderTaskProcessor Handles RenderTasks and RenderInstructions.
 +   * @param[in] vrManager Provides access to Tizen VR
     */
    UpdateManager( NotificationManager& notificationManager,
                   CompleteNotificationInterface& animationFinishedNotifier,