Richard Huang [Fri, 22 Jul 2016 16:00:59 +0000 (17:00 +0100)]
[dali_1.1.44] Merge branch 'devel/master'
Change-Id: I492e2bd9dba52710ab31dad8d3ec69e3ce4ea608
Richard Huang [Fri, 22 Jul 2016 16:00:21 +0000 (17:00 +0100)]
DALi Version 1.1.44
Change-Id: I683ba93df347503ea86439b9d8458853aff0bd42
dongsug.song [Wed, 20 Jul 2016 02:15:58 +0000 (11:15 +0900)]
accroding to ACR-520's review, dali's related feature and dependency (openGL ES 2.0) should be represented
Signed-off-by: dongsug song <dongsug.song@samsung.com>
Change-Id: Ifc7b0f00cbf21bb0b91476a40472cbe45c30ebe3
minho.sun [Mon, 18 Jul 2016 06:16:34 +0000 (23:16 -0700)]
Merge "Add PATH variable in dalireslog.sh" into devel/master
David Steele [Fri, 15 Jul 2016 14:09:20 +0000 (15:09 +0100)]
Added Patch coverage tool
After building and running automated tests, you can test
the coverage of your current patch (either in the working
directory, or the head patch, or some other difference to HEAD
supplied by the arguments).
The script will return 1 if the test coverage is less
than 90%, otherwise it will return 0 to indicate no error.
This script will also be run as part of the verification process.
Change-Id: I93b1115014e5383a33977e1950350a41d66e950b
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Fri, 15 Jul 2016 11:27:42 +0000 (12:27 +0100)]
[dali_1.1.43] Merge branch 'devel/master'
Change-Id: I63d5abdbd021af089c27af4e58ab878a49009c3a
David Steele [Fri, 15 Jul 2016 11:26:53 +0000 (12:26 +0100)]
DALi Version 1.1.43
Change-Id: I7f485640e135e32323f9b12d688da9ea291b49a3
Tom Robinson [Wed, 13 Jul 2016 12:36:20 +0000 (13:36 +0100)]
Moved Core Rendering API from devel-api to public-api
Change-Id: I0c5879551a42fe87a1afd9602da48ba55a707c9c
Adeel Kazmi [Wed, 13 Jul 2016 14:46:56 +0000 (07:46 -0700)]
Merge "Remove Geometry::QUAD() usage from Adaptor" into devel/master
Xiangyin Ma [Mon, 11 Jul 2016 16:57:06 +0000 (09:57 -0700)]
Remove Geometry::QUAD() usage from Adaptor
Change-Id: I7947830c13efb2e9be3a1862bead4b0cfc358e55
Jonghyun Ho [Tue, 12 Jul 2016 09:44:02 +0000 (18:44 +0900)]
Fixed not to sleep thread before it's terminated
[Problem] Device hanged for a while inserting camera captured image to memo
[Cause & Measure] Thread falls asleep right before calling pthread_join
[Checking Method] Fixed not to sleep thread before it's terminated
Change-Id: Iea4ea4b7ef6877667cbe7c0ee21bdde58986c174
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Tom Robinson [Mon, 11 Jul 2016 13:55:32 +0000 (14:55 +0100)]
Moved TextureSet::SetImage() to separate devel-api module
Change-Id: I9c80e53b3732233322dd1ce7febfe10e1ebc91e5
Adeel Kazmi [Fri, 8 Jul 2016 16:52:41 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master
Agnelo Vaz [Fri, 8 Jul 2016 16:43:58 +0000 (17:43 +0100)]
[dali_1.1.42] Merge branch 'devel/master'
Change-Id: I41afa4c2e8e5cae0c455681f197e5088c4bb8970
Agnelo Vaz [Fri, 8 Jul 2016 16:43:28 +0000 (17:43 +0100)]
DALi Version 1.1.42
Change-Id: Ibd839efe22a0aa5ef5de306357978a3f7051950a
Paul Wisbey [Fri, 8 Jul 2016 13:56:13 +0000 (06:56 -0700)]
Merge "Updated Indicator to use SetTexture" into devel/master
Ferran Sole [Thu, 7 Jul 2016 10:28:46 +0000 (11:28 +0100)]
Modified font-client to generate PixelData objects instead of BufferImage
Change-Id: I0178d645da49b0f7d599ec1e859fe30f3f0e86cb
Tom Robinson [Fri, 8 Jul 2016 09:59:47 +0000 (10:59 +0100)]
Updated Indicator to use SetTexture
Change-Id: I9ce229371743d81460e6866ac8b59b54ca7878b5
Adeel Kazmi [Thu, 7 Jul 2016 10:02:31 +0000 (11:02 +0100)]
(Emscripten) Use the new Touch API
Change-Id: Ib7071715f77b609970182455cb09ccec8429af07
Adeel Kazmi [Tue, 5 Jul 2016 10:03:59 +0000 (11:03 +0100)]
Fix LibUV debug build break
Change-Id: I3d34b398765deec2643ee5b93c2f5eea81b2f225
minho.sun [Mon, 4 Jul 2016 01:24:43 +0000 (10:24 +0900)]
Add PATH variable in dalireslog.sh
Add PATH variable in dalireslog.sh to reinforce security
Someone can attack with modifying $PATH variable when excuting shell script
To prevent this, declare $PATH on top of scripts
Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: I9c8a359366abd0d1bc47e42b98ff2b37d2db6fdb
suhyung Eom [Fri, 24 Jun 2016 08:57:31 +0000 (17:57 +0900)]
Differentiate public header files according to profile
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I96ccf3c8c0ff2f5175a8a792f1b7ca5f5f8cdd50
suhyung Eom [Fri, 24 Jun 2016 02:16:52 +0000 (11:16 +0900)]
Separate watch-application.h into wearable.h
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I770055531db9615f6dc5281dc9cb90ce301c7a42
Paul Wisbey [Fri, 1 Jul 2016 13:49:25 +0000 (06:49 -0700)]
Merge "DALi Version 1.1.41" into devel/master
adam.b [Fri, 1 Jul 2016 13:29:11 +0000 (14:29 +0100)]
[dali_1.1.41] Merge branch 'devel/master'
Change-Id: Ie6f8e0ce0ac6f418701171963393e01e49cc0e21
adam.b [Fri, 1 Jul 2016 13:28:25 +0000 (14:28 +0100)]
DALi Version 1.1.41
Change-Id: I33835f3a4686c712ab9e99cd16c6f8822632dff4
Paul Wisbey [Fri, 1 Jul 2016 07:19:06 +0000 (00:19 -0700)]
Merge "Fix for color emojis fonts." into devel/master
Victor Cebollada [Tue, 21 Jun 2016 16:16:16 +0000 (17:16 +0100)]
Fix for color emojis fonts.
* Uses the fixed size to generate the glyphs but uses
the point size given by the user to cache the font
and generate the metrics.
Change-Id: If3e03f85239c50678642e788d238e96f4696d127
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Thu, 30 Jun 2016 10:42:48 +0000 (11:42 +0100)]
Updated desktop test harness for easier TC debugging
Added a new "-d" option to execute.sh to invoke the debugger
on the speficied test case.
Change-Id: I16213e83bccc56f9ff063506e2f9d388f045dc0c
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 30 Jun 2016 10:13:33 +0000 (03:13 -0700)]
Merge "Fix bug in VideoView::SetMuted()" into devel/master
Ferran Sole [Tue, 28 Jun 2016 15:49:26 +0000 (16:49 +0100)]
Changes following patch "Added support for compressed texture upload to Render::NewTexture"
Change-Id: I67ab1690d2dc037ec737e86b4043e05a7f3fc94d
taeyoon [Tue, 28 Jun 2016 06:22:01 +0000 (15:22 +0900)]
Fix bug in VideoView::SetMuted()
- Remove code duplication
Change-Id: I4e2d0d32d10c286195537e8a82f53f8e67d19720
Seoyeon Kim [Tue, 21 Jun 2016 07:22:48 +0000 (16:22 +0900)]
Fix Svace warning issue
- Initialized local variable at tizen-video-player.cpp
- prevention of Null pointer dereference at seat.cpp
Change-Id: I9f83ae209856dba832744e6bca1f498ed71ee908
Victor Cebollada [Fri, 24 Jun 2016 07:49:55 +0000 (08:49 +0100)]
[dali_1.1.40] Merge branch 'devel/master'
Change-Id: I78056d7051401d24fe5c7e80d5d4b6d15945452c
Victor Cebollada [Fri, 24 Jun 2016 07:35:48 +0000 (08:35 +0100)]
DALi Version 1.1.40
Change-Id: I7ed11b10968b240c14175becc6d308959ba02c25
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Mon, 20 Jun 2016 14:15:15 +0000 (15:15 +0100)]
Updated test harness to add map of named parameters to Gl traces.
As well as storing the parameter list as a single string, have added
(for GlAbstraction) a named parameter map. This should prevent changes
to the trace from breaking existing tests in the future, and also
provides a slightly easier to use method for searching for methods with
specific parameters.
Change-Id: Id415ede1a35406c4d48c9df17389e08f05c65b39
Signed-off-by: David Steele <david.steele@samsung.com>
Tom Robinson [Fri, 17 Jun 2016 17:21:00 +0000 (18:21 +0100)]
Fixed URLs of images being pasted into TextField
When pasting an image (from the clipboard or directly) to a TextField, nothing should be pasted. Currently, without this patch, the image URL is pasted.
Change-Id: I2111c27c1f9c9e111db3cd8e641dbb43c3253dd1
Victor Cebollada [Sat, 18 Jun 2016 10:50:54 +0000 (11:50 +0100)]
IMF manager X implmentation clean.
* Stop using SetSurroundingText() as it does nothing.
* Use the returned ImfCallbackData data for all event signal emitted.
Change-Id: Ib13e91b188eb6271b534f54ab0d687d88a1dca6c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 17 Jun 2016 10:44:07 +0000 (11:44 +0100)]
[dali_1.1.39] Merge branch 'devel/master'
Change-Id: I9abdb89a2a9727dbd4b27cfaffc15a4c68d499dd
Adeel Kazmi [Fri, 17 Jun 2016 10:43:17 +0000 (11:43 +0100)]
DALi Version 1.1.39
Change-Id: I7b467dee478f138cafabf5475fafe70c83c64082
Adeel Kazmi [Thu, 16 Jun 2016 07:47:37 +0000 (08:47 +0100)]
(Touch) Add Pressure, radius & angle information
Change-Id: I9b86385cd3da84719d39ba60841c4e7540c7fa01
Adeel Kazmi [Thu, 16 Jun 2016 18:14:35 +0000 (11:14 -0700)]
Merge "Temporary fix of build break. wl_text_input_set_surrounding_text() is deprecated wrongly and proper guide will be come later. before that patch, this needs to be commented out" into devel/master
taeyoon [Wed, 16 Mar 2016 07:45:31 +0000 (16:45 +0900)]
Video player plugin for video view control
Add plugin for video playback in tizen wayland
Change-Id: Ifaf9d3cf016bcfe7f2f9f37bbaf86aad73480acd
dongsug.song [Tue, 14 Jun 2016 11:59:26 +0000 (20:59 +0900)]
Temporary fix of build break. wl_text_input_set_surrounding_text() is deprecated wrongly and proper guide will be come later. before that patch, this needs to be commented out
Change-Id: Id3d1b3737139ca2fcb1c54fd7aa9e10fe124f678
Paul Wisbey [Mon, 13 Jun 2016 10:19:22 +0000 (03:19 -0700)]
Merge "Removed HasRendered() queries. They were stopping from calling PostRender() and preventing finalizing the rendering operations per frame in case there were no renderables to draw." into devel/master
Xiangyin Ma [Fri, 10 Jun 2016 10:48:48 +0000 (11:48 +0100)]
[dali_1.1.38] Merge branch 'devel/master'
Change-Id: If3b13481ac18313c59ef8c83d36cfacffd1ce173
Xiangyin Ma [Fri, 10 Jun 2016 10:47:58 +0000 (11:47 +0100)]
DALi Version 1.1.38
Change-Id: I37e5dd74ade1b4a963c50b31b6504769e0eaedb6
adam.b [Thu, 9 Jun 2016 17:38:19 +0000 (18:38 +0100)]
Removed HasRendered() queries.
They were stopping from calling PostRender() and preventing
finalizing the rendering operations per frame in case there were no renderables to draw.
Change-Id: I80f1e17fba7c6bad9a7255673f6be90ad1420367
suhyung Eom [Wed, 8 Jun 2016 06:51:41 +0000 (15:51 +0900)]
Change API version number of WatchApplication class
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I193bb14e5a9f42b6e2187185fbc40fdde88e2bda
Kimmo Hoikka [Fri, 3 Jun 2016 16:12:08 +0000 (09:12 -0700)]
Merge "Update BitmapLoader following the PixelData change" into devel/master
Paul Wisbey [Fri, 3 Jun 2016 14:20:25 +0000 (07:20 -0700)]
Merge "DALi Version 1.1.37" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:34:01 +0000 (14:34 +0100)]
[dali_1.1.37] Merge branch 'devel/master'
Change-Id: I6d8f62b3713c798929c6c63acd5e45021b1ef2ba
Tom Robinson [Fri, 3 Jun 2016 13:33:32 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: Ib397544c05b88d7154e73fcf1e8df7b48f957157
Xiangyin Ma [Wed, 25 May 2016 16:31:30 +0000 (17:31 +0100)]
Update BitmapLoader following the PixelData change
Change-Id: I392825bc6915530faf475cfae635f892c8ea4d60
suhyung Eom [Thu, 2 Jun 2016 05:57:01 +0000 (14:57 +0900)]
Add WatchApplication UTC
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9ec9fa3c942d159d315c4e88264ef17916d73104
suhyung Eom [Thu, 28 Apr 2016 07:28:44 +0000 (16:28 +0900)]
Implement WatchApplication class
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ic18e12302823303adff8faaa14a36f063ac6d0f6
Adeel Kazmi [Fri, 27 May 2016 12:35:07 +0000 (05:35 -0700)]
Merge "DALi Version 1.1.36" into devel/master
Richard Huang [Fri, 27 May 2016 11:21:45 +0000 (12:21 +0100)]
[dali_1.1.36] Merge branch 'devel/master'
Change-Id: I4fbcfcc6d979a76ecac18e3e3d9140aa78593d5c
Richard Huang [Fri, 27 May 2016 11:20:32 +0000 (12:20 +0100)]
DALi Version 1.1.36
Change-Id: Ia36dcd4c5e53ab9f07e58ee872c708769fafb79b
Seoyeon Kim [Fri, 27 May 2016 05:39:39 +0000 (14:39 +0900)]
Prevention of NULL pointer dereference at EventHandler
Change-Id: Ic5149f3b71da300add2922ad916d2b4b1ecb8094
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Tom Robinson [Tue, 24 May 2016 14:58:01 +0000 (15:58 +0100)]
Allows debug builds to be enabled for GBS builds
You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:
--define "%enable_debug 1"
Details in README file.
Change-Id: Ibcbda7cd9840bf1c121eb272e0c64e8ea8d3c967
Heeyong Song [Thu, 19 May 2016 03:07:59 +0000 (12:07 +0900)]
Fix build error according to updating Khronos header
Change-Id: I32b25111f5bf3f876a3169acc5f41422bc6197b3
Heeyong Song [Mon, 23 May 2016 05:18:03 +0000 (14:18 +0900)]
Fix size error in wbmp loader
Change-Id: Ie90a734ed84d785e5d22e8d09a8004aec6354a5d
Nick Holland [Fri, 20 May 2016 10:18:03 +0000 (11:18 +0100)]
[dali_1.1.35] Merge branch 'devel/master'
Change-Id: Ic0491ebd32f324c1841b86eda9901022b558261b
Nick Holland [Fri, 20 May 2016 10:17:24 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: I4fe653b0c7c47e5a6cb11f63273190452d25d34d
dongsug.song [Tue, 17 May 2016 02:21:16 +0000 (11:21 +0900)]
TC fail because of tbm surface is not supporting specific color depth
- Add "IsSupportedColorDepth()" method to check which color depth is supported on a specific HW
- change the API name of "IsSupportedColorDepth()" to "IsColorDepthSupported()"
IsSupportedColorDepth
- fix Dali server build error
Change-Id: Ie2fb36bca91962a6ecd5c5054daf17ce5efea0f2
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Adeel Kazmi [Tue, 17 May 2016 14:07:16 +0000 (07:07 -0700)]
Merge "Remove ImageActor from ObjectProfiler and Emscripten" into devel/master
Adeel Kazmi [Tue, 17 May 2016 13:33:21 +0000 (06:33 -0700)]
Merge "Enable render notification after DALi renders (ecore Wayland)" into devel/master
Adeel Kazmi [Tue, 17 May 2016 11:40:28 +0000 (04:40 -0700)]
Merge "Wayland IMF support" into devel/master
Nick Holland [Mon, 16 May 2016 13:27:04 +0000 (14:27 +0100)]
Enable render notification after DALi renders (ecore Wayland)
Change-Id: I7812667a3fcace7dabb24740534c61a20a3d040b
Adeel Kazmi [Mon, 16 May 2016 17:25:55 +0000 (10:25 -0700)]
Merge "Use Geometry::QUAD() in UTC" into devel/master
Adeel Kazmi [Mon, 16 May 2016 16:17:28 +0000 (17:17 +0100)]
Updates following vector-wrapper include changes in core.
Change-Id: I767de4fbc03d09f2f17b62aecb7c88e8fb0b777f
Xiangyin Ma [Mon, 16 May 2016 16:12:46 +0000 (17:12 +0100)]
Use Geometry::QUAD() in UTC
Change-Id: I1c3931f987cabec0cdb5dede53baf4eee29c9b30
Xiangyin Ma [Wed, 11 May 2016 16:19:27 +0000 (17:19 +0100)]
Remove ImageActor from ObjectProfiler and Emscripten
Change-Id: I97b5f8f3ee862f3e61373455c4e32abf5b141a62
Adeel Kazmi [Mon, 16 May 2016 14:13:40 +0000 (07:13 -0700)]
Merge "Remove the usage of ImageActor from Indicator" into devel/master
Nick Holland [Wed, 11 May 2016 10:27:07 +0000 (11:27 +0100)]
Wayland IMF support
Pure Wayland Implementation for Wayland Tizen text protocol text.xml protocol. It Does not use ecore_wl wrapper API.
Tested on Tizen 3 TV image
Note: the Tizen Text protocol is still in development
so this may need updating in the future.
See the repo for the text protocol:
https://review.tizen.org/gerrit/#/q/project:platform/core/uifw/wayland-extension
Change-Id: Ib3cad5caa5ba7fa1b0876b07b111ce2e84943c25
Xiangyin Ma [Mon, 9 May 2016 16:56:06 +0000 (17:56 +0100)]
Remove the usage of ImageActor from Indicator
Change-Id: I361758c9ce3a75e6ef39c4f1e55945ca1599472c
Heeyong Song [Thu, 12 May 2016 05:45:42 +0000 (14:45 +0900)]
Remove abort handler registration and change terminate callback
Change-Id: I73c221c5a97cbba1fd38cd7629f10e1659f523aa
Ferran Sole [Fri, 13 May 2016 10:55:13 +0000 (11:55 +0100)]
[dali_1.1.34] Merge branch 'devel/master'
Change-Id: I14b4fd62bd80d70a853c8d67a186a0294c93f9f6
Ferran Sole [Fri, 13 May 2016 10:54:45 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: I21ac34d1beb34bbd17e4674b33fc54ca39b1230f
Adeel Kazmi [Thu, 12 May 2016 14:06:06 +0000 (07:06 -0700)]
Merge "Ensured correct display of performance marker times" into devel/master
David Steele [Thu, 12 May 2016 13:50:02 +0000 (14:50 +0100)]
Ensured correct display of performance marker times
Float granularity is too low for performance markers - too many markers
were showing the same time. Upgraded it to a double - this allows the
multiplication to generate the right markers in the network client
Change-Id: I73a4eece36878c6d0cc5c5d320585dea28481ba9
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 12 May 2016 13:21:42 +0000 (14:21 +0100)]
(NetworkServer) Fix crash and deadlock on exit
- mListeningSocket was being dereferenced without checking if it was NULL.
- There was a dead lock when trying to stop the clients as both the main thread and the client thread
had mClientListMutex locked. The solution was to not join the client threads at all as it's not
required and allows the main thead to unlock the mutex.
Change-Id: Ibee9d6c775f0dfd4b1553b1594bf198b7cf56e92
Nick Holland [Tue, 26 Apr 2016 09:05:09 +0000 (10:05 +0100)]
Updated Wayland TextInput to match latest system changes
Change-Id: Ife9920178b8fb1f147c8964b1bdc8b3c6b83c0c0
Adeel Kazmi [Fri, 6 May 2016 14:51:31 +0000 (07:51 -0700)]
Merge "DALi Version 1.1.33" into devel/master
David Steele [Fri, 6 May 2016 14:47:52 +0000 (15:47 +0100)]
[dali_1.1.33] Merge branch 'devel/master'
Change-Id: Iab046a082b3b5fa488b57438f6b3a7ab12e98799
David Steele [Fri, 6 May 2016 14:47:26 +0000 (15:47 +0100)]
DALi Version 1.1.33
Change-Id: I42095b695b268b26fab49212643960bfcde558d5
Adeel Kazmi [Thu, 5 May 2016 19:22:31 +0000 (20:22 +0100)]
(Automated Tests) Platform Abstraction now handles multiple resource requests
Also synchronized some dali-test-suite-utils.h/cpp with toolkit.
Change-Id: Ie9b33de65cfad6456fd5bd8fc128db6e1cc9f2a5
Adeel Kazmi [Thu, 5 May 2016 14:29:51 +0000 (15:29 +0100)]
Build UBUNTU profile & for OpenGL ES 2.0 by default
This is overridden in the spec files for targets anyway so a completely unnecessary step for
UBUNTU users.
Change-Id: I1d19584737eceb42b4a5b0bd0d35b806f13e8124
Victor Cebollada [Thu, 5 May 2016 06:38:21 +0000 (07:38 +0100)]
Svace issues.
* Add undefined and private copy constructors and assignment operators to avoid copies.
Change-Id: I7ff0665f11f5b557ddb76e15b016ebda6eaaa808
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Tue, 3 May 2016 09:19:30 +0000 (10:19 +0100)]
Blending enum clean-up
We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.
As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)
Change-Id: I63f7b59cf7c5c234eda979d55213a2994e90860a
Kimmo Hoikka [Fri, 29 Apr 2016 15:01:35 +0000 (08:01 -0700)]
Merge "Changes following "Remove API to set if a geometry requires writing to the depth buffer"" into devel/master
Ferran Sole [Wed, 27 Apr 2016 07:19:05 +0000 (08:19 +0100)]
Changes following "Remove API to set if a geometry requires writing to the depth buffer"
Change-Id: I4739a7d9aa6e1b65a55761fda0166e7004cb1761
Agnelo Vaz [Fri, 29 Apr 2016 08:11:11 +0000 (09:11 +0100)]
[dali_1.1.32] Merge branch 'devel/master'
Change-Id: I9970393382b7900ebc30fc3185a442b1d584a828
Agnelo Vaz [Fri, 29 Apr 2016 08:10:10 +0000 (09:10 +0100)]
DALi Version 1.1.32
Change-Id: I4b6b65e084bffe999d78abaab8794ef87c3b0b09
Adeel Kazmi [Wed, 27 Apr 2016 13:52:55 +0000 (06:52 -0700)]
Merge "Fix doxygen errors" into devel/master
Richard Huang [Tue, 26 Apr 2016 15:54:45 +0000 (16:54 +0100)]
Fix doxygen errors
Change-Id: Idb6d53284874863fb1b9db915d273ef7b829857b
Ferran Sole [Tue, 26 Apr 2016 14:05:02 +0000 (15:05 +0100)]
Changes following "Make TextureSet a non property owner"
Change-Id: I87819057608e44c265e0f12f48e320be34363f71
Ferran Sole [Wed, 20 Apr 2016 15:09:55 +0000 (16:09 +0100)]
Changes following "Remove Geometry scene object"
Change-Id: I8332f8a52b33dbd7d852d2f87d4d9d6686edcf17
Adeel Kazmi [Fri, 22 Apr 2016 09:08:30 +0000 (10:08 +0100)]
[dali_1.1.31] Merge branch 'devel/master'
Change-Id: I3fc21172bd752ac9adaaece486f398b3a11e21ac
projects / platform / core / uifw / dali-adaptor.git / log