Agnelo Vaz [Fri, 6 Jul 2018 09:37:10 +0000 (10:37 +0100)]
[dali_1.3.31] Merge branch 'devel/master'
Change-Id: I266f125bac841ba714505ad236ad4c1d581b0625
Agnelo Vaz [Fri, 6 Jul 2018 09:36:10 +0000 (10:36 +0100)]
DALi Version 1.3.31
Change-Id: I0cf1fc2d0668958e7632d9ca75f050510cf92cad
Adeel Kazmi [Thu, 5 Jul 2018 16:06:13 +0000 (16:06 +0000)]
Merge "Changes order of events processing for new layouting." into devel/master
Anton Obzhirov [Thu, 5 Jul 2018 09:48:34 +0000 (10:48 +0100)]
Changes order of events processing for new layouting.
The old size negotiation events processing is moved
to run after the new layouting events processing.
It should help to do all the new layout updates and
the controls size updates in one iteration.
Change-Id: I364df1af22046f9a48fc0c9141c43b80fa60cc8c
dongsug.song [Tue, 29 May 2018 09:01:20 +0000 (18:01 +0900)]
Add GetMouseButton to identify right/left mouse button click
Change-Id: If2e2536851e081fc882786da1ff1595c255efae0
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
adam.b [Fri, 29 Jun 2018 12:51:11 +0000 (13:51 +0100)]
[dali_1.3.30] Merge branch 'devel/master'
Change-Id: I740097dd768712db124a58d4543b0b3e15f8c651
adam.b [Fri, 29 Jun 2018 12:50:27 +0000 (13:50 +0100)]
DALi Version 1.3.30
Change-Id: If1ae3721be04796311e82fb5afc44101eab5dd94
Victor Cebollada [Fri, 22 Jun 2018 07:55:33 +0000 (08:55 +0100)]
[dali_1.3.29] Merge branch 'devel/master'
Change-Id: Ic3fe094f337c8deaa47fb2cb3411c3fb26179e4d
Victor Cebollada [Fri, 22 Jun 2018 07:54:34 +0000 (08:54 +0100)]
DALi Version 1.3.29
Change-Id: I4e05244486e7dd950d08ef3400590457c5346110
David Steele [Thu, 21 Jun 2018 21:24:44 +0000 (21:24 +0000)]
Merge "Added signal to inform when an Actor's children have changed order" into devel/master
David Steele [Fri, 15 Jun 2018 16:18:51 +0000 (16:18 +0000)]
Merge "Added DEBUG_LOG_STREAM for using stream operator" into devel/master
David Steele [Fri, 15 Jun 2018 15:35:32 +0000 (16:35 +0100)]
Added signal to inform when an Actor's children have changed order
At present, this fires immediately after a call to Raise/Lower or other such
APIs. This means that layouting has a chance to run before the re-writing of depth
information.
Change-Id: Ie2488a14f1f17df93589c396f6c8b699d6783090
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Thu, 14 Jun 2018 16:54:43 +0000 (17:54 +0100)]
Added DEBUG_LOG_STREAM for using stream operator
Change-Id: I7864dd73c6b313b41b9b9ba7aab20e94cb262d55
Paul Wisbey [Tue, 12 Jun 2018 17:51:48 +0000 (18:51 +0100)]
Fix to avoid render-task waiting forever
We require a finished signal to be emitted after rendering to the screen,
i.e. to know when the scene has been rendered for the 1st time.
Unfortunately RenderTask SetRefreshRate(REFRESH_ONCE) is causing scene updates to run forever.
This is is due to the mWaitingToRender flag which in that case will never be set to false.
Change-Id: Ia3cd411e65adc613be81db3d09d35ade87ae9f62
György Straub [Fri, 8 Jun 2018 10:50:24 +0000 (11:50 +0100)]
[dali_1.3.28] Merge branch 'devel/master'
Change-Id: I5f15da4c490c922d2c01a574be34aa1dea6681bf
György Straub [Fri, 8 Jun 2018 10:49:26 +0000 (11:49 +0100)]
DALi Version 1.3.28
Change-Id: Id705eba32a80b887d092189025fbc79fdb7767c3
David Steele [Fri, 1 Jun 2018 13:16:42 +0000 (14:16 +0100)]
[dali_1.3.27] Merge branch 'devel/master'
Change-Id: I70af347a937fe83951f53dc0efbcb6c22492841d
David Steele [Fri, 1 Jun 2018 13:15:44 +0000 (14:15 +0100)]
DALi Version 1.3.27
Change-Id: Icf5c1420c99947c03a1a0699f00177dbd9c61e4a
Adeel Kazmi [Thu, 24 May 2018 13:26:45 +0000 (13:26 +0000)]
Merge "DALi Version 1.3.26" into devel/master
thothamon [Thu, 24 May 2018 13:18:51 +0000 (14:18 +0100)]
[dali_1.3.26] Merge branch 'devel/master'
Change-Id: Id341624fb47a2b7b484535573b6ab3f8412a857b
thothamon [Thu, 24 May 2018 13:17:47 +0000 (14:17 +0100)]
DALi Version 1.3.26
Change-Id: I7473af56dc3a81a2cb01937dc7e63408defb3a77
Adeel Kazmi [Tue, 22 May 2018 15:41:31 +0000 (16:41 +0100)]
Added clarifications to Matrix & Matrix3 documentation & removed unused debug functions
Also corrected how the ostream functions print out Matrix & Matrix3.
Change-Id: I6a20b8f6e5de138db29cac7baae1346905310ced
greynaga [Fri, 18 May 2018 11:04:01 +0000 (12:04 +0100)]
[dali_1.3.25] Merge branch 'devel/master'
Change-Id: Icde7da62b68ead052998652c4732c1cd44858029
greynaga [Fri, 18 May 2018 11:03:17 +0000 (12:03 +0100)]
DALi Version 1.3.25
Change-Id: I983adefd4fd5d4296367487ce88a41d85f69096d
Anton Obzhirov [Tue, 15 May 2018 16:50:32 +0000 (17:50 +0100)]
Add GTest.
Change-Id: Ic9e3042a40a326399b9133e418c9249c174abfed
adun [Fri, 11 May 2018 01:57:59 +0000 (09:57 +0800)]
Seperate the API macros
Change-Id: If42263c0ba8972919fc4d7a5581c5ad06c18a9d6
Anton Obzhirov [Thu, 10 May 2018 16:06:59 +0000 (17:06 +0100)]
(dali_env) Added cifs-utils dependency
Change-Id: I4678b5c20c1ecfecb9b4038b329930fb805fb0a3
Anton Obzhirov [Thu, 10 May 2018 14:55:52 +0000 (15:55 +0100)]
[dali_1.3.24] Merge branch 'devel/master'
Change-Id: I260547ee399b2105149443b07165f367c024bf31
Anton Obzhirov [Thu, 10 May 2018 14:55:08 +0000 (15:55 +0100)]
DALi Version 1.3.24
Change-Id: I55faf68d10f133f12a8449dd5be0e15e7d92e450
Angelos Gkountis [Fri, 4 May 2018 15:28:49 +0000 (16:28 +0100)]
[dali_1.3.23] Merge branch 'devel/master'
Change-Id: I308bd36260a02f5413ea0610801615a4c8846f39
Angelos Gkountis [Fri, 4 May 2018 15:28:08 +0000 (16:28 +0100)]
DALi Version 1.3.23
Change-Id: I5b1760e10553d55f0609004dd424e8692647fcfc
Agnelo Vaz [Fri, 27 Apr 2018 11:05:53 +0000 (12:05 +0100)]
[dali_1.3.22] Merge branch 'devel/master'
Change-Id: I891d65cc738e0e5fd233ac9dfad398646aec68ac
Agnelo Vaz [Fri, 27 Apr 2018 11:04:48 +0000 (12:04 +0100)]
DALi Version 1.3.22
Change-Id: Ibe7e70b10411a3c689658ebff00fc0d69cd179f8
xb.teng [Tue, 27 Feb 2018 12:26:15 +0000 (20:26 +0800)]
Support compose variable for key event
Change-Id: I2d84e5f42a9a5165ed3ecd03b1a6f937b3eb8815
Adeel Kazmi [Tue, 24 Apr 2018 10:45:30 +0000 (10:45 +0000)]
Merge "Added ChildAdded and ChildRemoved signals to Actor" into devel/master
David Steele [Fri, 13 Apr 2018 11:37:23 +0000 (12:37 +0100)]
Added ChildAdded and ChildRemoved signals to Actor
Actor currently has OnChildAdded and OnChildRemoved to inform derived classes when
children are added to or removed from the actor. However, there is currently no
mechanism for another object to find out this information. Added signals so that
other objects can listen for this state change.
Note, these signals are sent after the callbacks; if the derived classes choose
to do something odd as a result of the callback, such as reparent the child, the
signal may not reflect truth in the derived parent.
Change-Id: I348bf0a3314baaa6f7b1a1c939e3ce9821f3485a
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Fri, 20 Apr 2018 10:58:38 +0000 (11:58 +0100)]
[dali_1.3.21] Merge branch 'devel/master'
Change-Id: I9291712a30ab1f19b7c0324bbe2160bba405a83d
Adeel Kazmi [Fri, 20 Apr 2018 10:57:52 +0000 (11:57 +0100)]
DALi Version 1.3.21
Change-Id: Ied1130122bf273d8e06a24326d88e1fbccfa6f52
minho.sun [Tue, 17 Apr 2018 07:40:17 +0000 (16:40 +0900)]
Initialize mDepthIndex of RenderItem in AddRendererToRenderList
RenderItem can be re-used.
Before using RenderItem again, initialize mDepthIndex to 0.
Change-Id: I47b9261767cb3dbc104db2049d893bf439d3bd98
Signed-off-by: minho.sun <minho.sun@samsung.com>
Paul Wisbey [Thu, 12 Apr 2018 16:25:34 +0000 (17:25 +0100)]
Fix crash issue when SetProperty is called with an invalid type
Previously this would result in a crash, since the PropertyMetadata
would be overwritten with the incorrect type of Property::Value
float uRadius( 5.0f );
actor.RegisterProperty( "radius", uRadius );
Property::Value propertyValue;
propertyValue = int(1);
Property::Index radius = actor.GetPropertyIndex( "radius" );
actor.SetProperty( radius, propertyValue );
The crash happens after attempting to cast to the wrong type of
AnimatableProperty in Actor::SetSceneGraphProperty
Change-Id: I8d42d190f81ff97cb9667da248911ed5ae6475dc
adam.b [Fri, 13 Apr 2018 10:49:23 +0000 (11:49 +0100)]
[dali_1.3.20] Merge branch 'devel/master'
Change-Id: Ifc863c971f43a185e8207f21882a8b8176278e5d
adam.b [Fri, 13 Apr 2018 10:48:41 +0000 (11:48 +0100)]
DALi Version 1.3.20
Change-Id: Ibdefbf46dec527c688a9e441b0dc19cc5535335c
David Steele [Fri, 6 Apr 2018 14:05:04 +0000 (14:05 +0000)]
Merge "DALi Version 1.3.19" into devel/master
Richard Huang [Fri, 6 Apr 2018 13:55:37 +0000 (14:55 +0100)]
[dali_1.3.19] Merge branch 'devel/master'
Change-Id: I26c8a63ed085e335db098655ec853bf4bed0b0ca
Richard Huang [Fri, 6 Apr 2018 13:54:52 +0000 (14:54 +0100)]
DALi Version 1.3.19
Change-Id: Iaf94232fc30dda54b1bd7e5532021f0b0207e558
David Steele [Fri, 23 Mar 2018 18:26:23 +0000 (18:26 +0000)]
Added TypeInfo::GetChildPropertyIndices
Change-Id: I909a6ac928739a5563d3ad231686a2f43d5331c8
David Steele [Wed, 14 Mar 2018 16:48:37 +0000 (16:48 +0000)]
Added mechanism for registering child properties on arbitrary actor
Want to register child properties for a container view from a second
class, e.g. a layout. This adds mechanism to register properties on
a registered type by type name.
Added a signal which triggers when a property is set on an object
(Note, OnPropertySet is available for derived types, but not for arbitrary objects)
Change-Id: Icf5c9856c66e1beadf80e55bc31ca9c1130f4a60
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Tue, 26 Sep 2017 15:53:13 +0000 (16:53 +0100)]
Extending the event loop with Processors
It is now possible to add processors to the event loop through
the integration API, allowing Toolkit to run a processor at the
end of the event loop (before sending messages to Update queue)
Change-Id: Ifb14b7b626d5574fe08e9c199746e63d56d82920
Signed-off-by: David Steele <david.steele@samsung.com>
Umar [Fri, 23 Feb 2018 20:19:44 +0000 (20:19 +0000)]
Added Trace Functionality using Performance Server.
Change-Id: Ifef92fd13a711beb592b61786eeb8e214f6d1196
Adeel Kazmi [Wed, 4 Apr 2018 14:07:44 +0000 (14:07 +0000)]
Merge "Fixing bug with changing a shader on a renderer" into devel/master
Joogab Yun [Sun, 1 Apr 2018 23:42:26 +0000 (08:42 +0900)]
add doc for API reference
Change-Id: I30533679df52ae45271bb7bb5319b49fcde864bf
David Steele [Thu, 29 Mar 2018 17:19:37 +0000 (18:19 +0100)]
Fixing bug with changing a shader on a renderer
If the renderer's shader is updated, as is the case in the refraction demo,
then the texture doesn't get shown. This is because the attributes location
cache isn't updated on the renderer when the shader changes (The attributes
location cache should really be in the Program, not in the Renderer).
Modified scene-graph-renderer to ensure that the geometry is resent to the
RenderRenderer - this sets a flag to re-load the attributes and cache them.
Change-Id: I8edfab92f89213ddb19ca3bd469e2be756c647ad
Signed-off-by: David Steele <david.steele@samsung.com>
György Straub [Thu, 29 Mar 2018 13:04:06 +0000 (14:04 +0100)]
[dali_1.3.18] Merge branch 'devel/master'
Change-Id: I1f677704d6c2cca3ca8b5c93fc470c04f7f2851c
György Straub [Thu, 29 Mar 2018 13:03:17 +0000 (14:03 +0100)]
DALi Version 1.3.18
Change-Id: I808c1de6cc02c945df8e965c67a419b4a0877bfa
Umar [Fri, 23 Mar 2018 13:41:18 +0000 (13:41 +0000)]
[dali_1.3.17] Merge branch 'devel/master'
Change-Id: I1729c7e6bf383880c2081a64dca7e6cb1705b009
Umar [Fri, 23 Mar 2018 13:40:29 +0000 (13:40 +0000)]
DALi Version 1.3.17
Change-Id: I781eca5449e0e796d875d5f619be2941000d627c
Heeyong Song [Thu, 22 Mar 2018 06:55:53 +0000 (06:55 +0000)]
Merge "Add OPACITY property to Renderer" into devel/master
Victor Cebollada [Fri, 16 Mar 2018 11:52:20 +0000 (11:52 +0000)]
[dali_1.3.16] Merge branch 'devel/master'
Change-Id: I612853506eaea0e893943101b6240f20866a0df7
Victor Cebollada [Fri, 16 Mar 2018 11:51:09 +0000 (11:51 +0000)]
DALi Version 1.3.16
Change-Id: I1e316ac1f53f054f8919c35119016f70403490a2
Seoyeon Kim [Wed, 14 Mar 2018 04:42:31 +0000 (13:42 +0900)]
Fix SVACE issue
- Changed KeyValuePair variable name because name 'pair' is already defined
at 466 line. (In the same scope)
Change-Id: Id20a0b7793f6f87e985b34234c06a3c9b764f63c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Heeyong Song [Fri, 9 Feb 2018 09:43:38 +0000 (18:43 +0900)]
Add OPACITY property to Renderer
Change-Id: Ie7da7d60e2a97e289014ae83cadb0be8157af353
greynaga [Fri, 9 Mar 2018 14:12:28 +0000 (14:12 +0000)]
[dali_1.3.15] Merge branch 'devel/master'
Change-Id: Idab5860964b8848f1bf5330d7fffbbe2f60edad9
greynaga [Fri, 9 Mar 2018 14:11:12 +0000 (14:11 +0000)]
DALi Version 1.3.15
Change-Id: I1c8ab9e440f25ad7f377c85979aedd91e2f23c55
Seoyeon Kim [Thu, 8 Mar 2018 02:08:33 +0000 (02:08 +0000)]
Merge "Fix typo error in some descriptions" into devel/master
Seoyeon Kim [Mon, 5 Mar 2018 06:16:31 +0000 (15:16 +0900)]
Fix typo error in some descriptions
- Fixed typo.
Change-Id: I91f0b3798c0152eab3183996a7dd3d324a672a50
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Francisco Santos [Fri, 2 Mar 2018 11:51:42 +0000 (11:51 +0000)]
[dali_1.3.14] Merge branch 'devel/master'
Change-Id: I46f7f3068a1ebf08c4d211422b23651d58acab7e
Francisco Santos [Fri, 2 Mar 2018 11:50:59 +0000 (11:50 +0000)]
DALi Version 1.3.14
Change-Id: Icd03823bc76c651dbede4348c525f8fd5e780a2e
Adeel Kazmi [Thu, 1 Mar 2018 15:38:28 +0000 (15:38 +0000)]
Merge "Fix SVACE issues" into devel/master
Paul Wisbey [Fri, 23 Feb 2018 13:41:51 +0000 (13:41 +0000)]
Merge "DALi Version 1.3.13" into devel/master
Agnelo Vaz [Fri, 23 Feb 2018 13:29:18 +0000 (13:29 +0000)]
[dali_1.3.13] Merge branch 'devel/master'
Change-Id: Iad330e5b139dbbee1c124d5e277c1bab650f31cb
Agnelo Vaz [Fri, 23 Feb 2018 13:28:29 +0000 (13:28 +0000)]
DALi Version 1.3.13
Change-Id: I83599daab7ea756a00f502bbc1610fcf5e4f1c5e
Heeyong Song [Wed, 21 Feb 2018 03:51:52 +0000 (12:51 +0900)]
Fix scissor clipping
Sibling case should be checked seperately.
Change-Id: Ic8531d1c408a61c01ddd792a31b03734c1e95131
Heeyong Song [Wed, 21 Feb 2018 02:03:23 +0000 (11:03 +0900)]
Fix blending factor for premultiplied alpha format
Change-Id: I8030e1bd05a69d8afa06d2d0da12f40fc3f3d8d7
Heeyong Song [Wed, 14 Feb 2018 06:13:33 +0000 (15:13 +0900)]
Fix CLIP_TO_BOUNDING_BOX error
Change-Id: I59022e5883cdcd381479511ff0181b529227ddce
Heeyong Song [Mon, 29 Jan 2018 08:19:24 +0000 (17:19 +0900)]
Use round to fix clipping area calculation
Change-Id: Iddb7b61388b3f8a57e0ee334c0c9d958aedfc882
Seoyeon Kim [Mon, 19 Feb 2018 08:00:17 +0000 (17:00 +0900)]
Fix SVACE issues
- Initialized some member variables.
Change-Id: Iafd620f70015fc11b3d5a22ff31ed1decc39d3b8
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Heeyong Song [Wed, 31 Jan 2018 09:34:52 +0000 (18:34 +0900)]
Add a flag to force the Clear on the framebuffer
Change-Id: I2e14cfa110dea9265e02b3432fac55d637ff3842
David Steele [Fri, 16 Feb 2018 13:56:11 +0000 (13:56 +0000)]
[dali_1.3.12] Merge branch 'devel/master'
Change-Id: Ic32defa3f06c4e1f89938e8f6c302372c28b4f24
David Steele [Fri, 16 Feb 2018 13:55:25 +0000 (13:55 +0000)]
DALi Version 1.3.12
Change-Id: If6fc96d079967887b85a8e60a2416851c34f47e2
adam.b [Fri, 9 Feb 2018 11:09:14 +0000 (11:09 +0000)]
[dali_1.3.11] Merge branch 'devel/master'
Change-Id: Ic31ded1a95913754c002308339ab028325431b47
adam.b [Fri, 9 Feb 2018 11:08:30 +0000 (11:08 +0000)]
DALi Version 1.3.11
Change-Id: I07a773b0b22506789083b4331b07397e391ddb7f
Adeel Kazmi [Fri, 2 Feb 2018 10:29:00 +0000 (10:29 +0000)]
[dali_1.3.10] Merge branch 'devel/master'
Change-Id: Iba8d5aab5033ff712e0a175caf4157c7678a55a1
Adeel Kazmi [Fri, 2 Feb 2018 10:28:18 +0000 (10:28 +0000)]
DALi Version 1.3.10
Change-Id: Idd7e7c0396a97158091b3def2427ad27d52dba11
Paul Wisbey [Tue, 30 Jan 2018 16:03:02 +0000 (16:03 +0000)]
Adding missing configure messages
Change-Id: Ia2ad03829b1f9f0cd33261d4492a306603557c7d
Adeel Kazmi [Tue, 30 Jan 2018 15:26:19 +0000 (15:26 +0000)]
Merge changes Ifb1d366c,I250378ee into devel/master
* changes:
Change in texture set requires recreation of uniform map
Mark uniform map as not having changed when it's ready
Adeel Kazmi [Mon, 29 Jan 2018 21:52:20 +0000 (21:52 +0000)]
Merge "Changed Update to reset only target properties each frame" into devel/master
Francisco Santos [Fri, 27 Oct 2017 15:34:44 +0000 (16:34 +0100)]
Change in texture set requires recreation of uniform map
Aging SceneGraph::Renderer::mRegenerateUniformMap() isn't necessarily matched by
calls to Render::Renderer::SetUniforms(), which isn't called if textures aren't ready.
Change-Id: Ifb1d366c579dac196de27d653688e776184a513d
David Steele [Wed, 24 Jan 2018 13:59:55 +0000 (13:59 +0000)]
Changed Update to reset only target properties each frame
Currently all default and custom animated properties are reset each frame.
This is wasteful, as unnecessary time is spent setting the same value again and again.
Instead, have added a new PropertyResetter, which is created when a property is being
animated or constrained. This is responsible for resetting the double buffered values
of that property.
Transform Manager properties are unaffected, as the reset is a single memset/memcpy
that handles all such properties at once, and is much faster than resetting properties
individually.
Added a PropertyResetter to animators.
Removed property reset from everything except transform manager.
Ensured property resetters die with animators
Added lifecycle observer to scene graph animators
Hooked up property resetter to observe animator destruction
Added aging to property resetter to ensure it resets for another frame after
animator death
Added constraint resetters
Changing connection to disconnection tracking fixes constraint velocity issue
Also changed Property::Bake to write to both buffer indexed values.
Ensured property resetters destroyed after animations ( animators have a resetter
observing destruction; order matters ).
Change-Id: Ia11f0e45744b09859ce1b87f306e1829efbb8fac
Signed-off-by: David Steele <david.steele@samsung.com>
Francisco Santos [Fri, 27 Oct 2017 16:11:03 +0000 (17:11 +0100)]
Mark uniform map as not having changed when it's ready
Change-Id: I250378ee07690ee04cbc94a65a1623a69c2a32c8
Umar [Fri, 26 Jan 2018 14:18:27 +0000 (14:18 +0000)]
[dali_1.3.9] Merge branch 'devel/master'
Change-Id: I72ec8f91d1a4da156befdced650b9c5077968a52
Umar [Fri, 26 Jan 2018 14:17:34 +0000 (14:17 +0000)]
DALi Version 1.3.9
Change-Id: Ib41b8015763991edab424e731c1823fde5772b97
Heeyong Song [Wed, 17 Jan 2018 05:53:38 +0000 (14:53 +0900)]
Discard render instruction if it is empty
Change-Id: I79b4ffff23bbb4a3a08a16e84d0fa8f3889670d8
Victor Cebollada [Fri, 19 Jan 2018 08:16:33 +0000 (08:16 +0000)]
[dali_1.3.8] Merge branch 'devel/master'
Change-Id: I8e4baa9fc4b3bf7733391da0218904043eea422b
Victor Cebollada [Fri, 19 Jan 2018 08:15:34 +0000 (08:15 +0000)]
DALi Version 1.3.8
Change-Id: I1b2bae3df0d2db9595dbc63c428b15adac1e26c6
Adeel Kazmi [Tue, 16 Jan 2018 14:11:17 +0000 (14:11 +0000)]
Merge "Updates to CMake compile scripts" into devel/master
Seungho, Baek [Tue, 16 Jan 2018 06:48:11 +0000 (15:48 +0900)]
Fix doxygen format
- modify "/*" to "/**" in render-task.h:485, 496
Change-Id: I4cf292a3dc544868dc17db1031e64ca8d5e20abf
greynaga [Fri, 12 Jan 2018 14:07:15 +0000 (14:07 +0000)]
[dali_1.3.7] Merge branch 'devel/master'
Change-Id: If2e39ca722506c8ac30a82180e73a6e6479415a2
greynaga [Fri, 12 Jan 2018 14:06:33 +0000 (14:06 +0000)]
DALi Version 1.3.7
Change-Id: I24fb61fca8fae188ee7f9c60ddbdd35055986d7c
David Steele [Wed, 10 Jan 2018 17:46:40 +0000 (17:46 +0000)]
Updates to CMake compile scripts
Change-Id: I54dc9ef58bcc34ff6268412485fda675380e0d3c
Adeel Kazmi [Fri, 5 Jan 2018 15:43:23 +0000 (15:43 +0000)]
Merge "(dali_env) Added libssl-dev dependency" into devel/master