Heeyong Song [Wed, 29 Jul 2020 04:24:10 +0000 (13:24 +0900)]
Fix memory leak
Delete TimerCallback
Change-Id: I36ffddcb3668580095b0491876fe04a395ba5822
Heeyong Song [Tue, 28 Jul 2020 07:56:04 +0000 (16:56 +0900)]
Fix memory leak of callback
Change-Id: I4b62eb7a1ead054f24505a8fc4a4a96956a9e173
Adeel Kazmi [Fri, 24 Jul 2020 15:38:58 +0000 (15:38 +0000)]
Merge "AddOn manager" into devel/master
Adeel Kazmi [Fri, 24 Jul 2020 11:58:47 +0000 (11:58 +0000)]
Merge "Updates for NativeImageInterface" into devel/master
Adeel Kazmi [Fri, 24 Jul 2020 10:13:27 +0000 (10:13 +0000)]
Merge "DALi Version 1.9.22" into devel/master
Richard Huang [Fri, 24 Jul 2020 09:48:15 +0000 (10:48 +0100)]
DALi Version 1.9.22
Change-Id: I74c0950d538b50d8e63a8aed5c5e59a4e39311ee
adam.b [Thu, 16 Jul 2020 11:57:24 +0000 (12:57 +0100)]
AddOn manager
Change-Id: I50dc482ca0afd4b4a3a5eb2f2da2f218350727d2
Wonsik Jung [Thu, 11 Jun 2020 05:45:13 +0000 (14:45 +0900)]
Add the synchronization between Ui and Video player
This patch is to support the synchronization between video player and UI.
To do that, video player's changing function as resize/move should be called before calling eglSwapBuffers
Change-Id: I543f3646646bc8cbea6bacd9d8e81c12f6fe9187
Adeel Kazmi [Wed, 22 Jul 2020 16:08:43 +0000 (16:08 +0000)]
Merge "(WebP Loader) Ensure member variables are initialised (SVACE issue)" into devel/master
Adeel Kazmi [Wed, 22 Jul 2020 15:25:42 +0000 (16:25 +0100)]
(WebP Loader) Ensure member variables are initialised (SVACE issue)
Change-Id: Id1a5d8456496b82d5bdf80ebebf54919cdab9634
David Steele [Fri, 17 Jul 2020 16:53:05 +0000 (17:53 +0100)]
Updates for NativeImageInterface
Change-Id: Ic3876022a30503861172cff8c496b23eb0035d9c
Adeel Kazmi [Wed, 22 Jul 2020 10:28:23 +0000 (10:28 +0000)]
Merge "Fix compile error in MS-Windows." into devel/master
Daekwang Ryu [Tue, 23 Jun 2020 08:44:42 +0000 (17:44 +0900)]
Remove unnecessary setenv() calls
Change-Id: I9dbadd0ccefcc9995e3e31b401385b8cbd1ee0aa
Victor Cebollada [Tue, 21 Jul 2020 10:46:59 +0000 (11:46 +0100)]
Fix compile error in MS-Windows.
* The patch "Modify parameters of CreateNativeSurface()" adds a new parameter
to the RenderSurfaceFactory that is not added in the implementation for
MS Windows
* Couple of warnings 'struct/class declaration' removed.
Change-Id: If68666e14c78f20c1480afa5b2e9e6ed125d5bb8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Daekwang Ryu [Tue, 21 Jul 2020 02:00:03 +0000 (02:00 +0000)]
Merge "Modify parameters of CreateNativeSurface()" into devel/master
Daekwang Ryu [Mon, 20 Jul 2020 05:38:35 +0000 (14:38 +0900)]
Fix WL2 display sync
Dali tried to make a window before display is ready.
The issue occured when window size is set in Application class.
Change-Id: I625765901a40bfc6f94ab1e1862c62f0f3f2732f
adam.b [Fri, 17 Jul 2020 12:12:02 +0000 (13:12 +0100)]
DALi Version 1.9.21
Change-Id: Ifb57396b3b47486336cf9bee18b7815aeadc9208
Joogab Yun [Thu, 16 Jul 2020 02:27:19 +0000 (11:27 +0900)]
Default On partial update
if you want disable partial update, set DALI_DISABLE_PARTIAL_UPDATE=1
Change-Id: I80dcfb9493a9b4a3500653687bc13e3a9c14327c
Adeel Kazmi [Tue, 14 Jul 2020 20:43:47 +0000 (21:43 +0100)]
Changes after Stage moved to Devel API
Change-Id: I44dc5d46af3b8538b887048bedc5cb164ab4149d
Adeel Kazmi [Wed, 15 Jul 2020 11:32:15 +0000 (11:32 +0000)]
Merge changes Iad3de2a7,I404ca48d,I5a00e3e1 into devel/master
* changes:
windows: Fix .pdb debug symbol file installation
windows: Move getopt.h include file to the bottom
windows: Change wParam size to 64 bits
Adeel Kazmi [Tue, 14 Jul 2020 14:51:48 +0000 (15:51 +0100)]
Stop using Stage to get ObjectRegistry
Change-Id: I6fce9c63df17f1b78ec5801c6db462513fb27740
Adeel Kazmi [Tue, 14 Jul 2020 14:12:06 +0000 (15:12 +0100)]
Add methods to Application & Adaptor classes to retrieve the ObjectRegistry
Change-Id: I249478a4b3246d4cf07681fc5239cc9c569577a1
Wander Lairson Costa [Mon, 13 Jul 2020 18:56:55 +0000 (15:56 -0300)]
windows: Fix .pdb debug symbol file installation
On Windows, the pdb symbol file is located inside the `Debug`
subdirectory.
Change-Id: Iad3de2a7d76a8f21b1d7d45b46a364919b5eae1d
Daekwang Ryu [Mon, 15 Jun 2020 08:47:47 +0000 (17:47 +0900)]
Modify parameters of CreateNativeSurface()
The surface parameter has been added like other CreateSurface methods.
When users pass a native surface handle,
NativeRenderSurface doesn't make a native surface of a specific platform.
The position of NativeRenderSurface isn't needed.
Change-Id: I46bd39f784ad3b7ea5fc2631a89f49df785ae041
Wander Lairson Costa [Mon, 13 Jul 2020 18:58:02 +0000 (15:58 -0300)]
windows: Move getopt.h include file to the bottom
getopt-win32 defines the symbol _END_EXTERN_C and undefines at the end
of the file. It turns out msvc standard library defines this same
symbol.
If getopt.h is included before C++ standard includes, it will undef
_END_EXTERN_C and causes compilation errors under msvc.
We move the getopt.h to the end of the list of include files so it can't
mess up with internal msvcrt symbols.
Change-Id: I404ca48d096703d0be6b5f466402fb2ca0223033
Wander Lairson Costa [Tue, 14 Jul 2020 15:18:55 +0000 (12:18 -0300)]
windows: Change wParam size to 64 bits
The wParam message parameter is used to send the callback object pointer
to WM_WIN_CALLBACK messages. As it is fixed as a 32 bit value in DALi,
when running on 64 bits systems it sends an invalid pointer to message
receiver.
Change-Id: I5a00e3e1729098c2b5b71e68d614a2ddc0fc51cb
Adeel Kazmi [Tue, 14 Jul 2020 14:24:28 +0000 (14:24 +0000)]
Merge "(Window) Remove GetRenderTaskList from Devel API as it's been added to the Public API" into devel/master
Adeel Kazmi [Tue, 14 Jul 2020 12:24:13 +0000 (13:24 +0100)]
(Window) Remove GetRenderTaskList from Devel API as it's been added to the Public API
Change-Id: If56d69fd8c39463801cdbfe5cb40df4b7b74e3ba
Heeyong Song [Tue, 14 Jul 2020 01:07:54 +0000 (01:07 +0000)]
Merge "Use WeakHandle in RenderSurfaceInterface" into devel/master
Adeel Kazmi [Mon, 13 Jul 2020 21:42:02 +0000 (21:42 +0000)]
Merge "(Window) Move methods from Devel to Public API & add a new GetDpi method" into devel/master
Adeel Kazmi [Wed, 8 Jul 2020 17:11:38 +0000 (18:11 +0100)]
(Window) Move methods from Devel to Public API & add a new GetDpi method
Change-Id: I83eabbc3334bdd717e818eabac9330bd4c0a2062
Heeyong Song [Mon, 13 Jul 2020 08:47:10 +0000 (17:47 +0900)]
Use WeakHandle in RenderSurfaceInterface
Change-Id: Idd6da0815c1c0984495509e4ab5e5ff256ee72a8
Victor Cebollada [Fri, 10 Jul 2020 14:41:12 +0000 (15:41 +0100)]
Workaround to fix a link error in MS Windows
* The patch "Support a frame rendered / presented callback" uses the
FileDescriptorMonitor which is not implemented in MS Windows, and
it fails to link.
A stub implementation for MS Windows has been added.
Change-Id: Ide5f97f13a827f454d171ac9d08804f20de2fd0f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 10 Jul 2020 08:39:46 +0000 (09:39 +0100)]
[dali_1.9.20] Merge branch 'devel/master'
Change-Id: Ia66caa9ebbd4fa5323d909387cf4cb7efba6c33f
Adeel Kazmi [Fri, 10 Jul 2020 08:38:40 +0000 (09:38 +0100)]
DALi Version 1.9.20
Change-Id: I05b14efe9f4f11362a50b6645c59d573aecd536c
Adeel Kazmi [Thu, 9 Jul 2020 16:33:19 +0000 (16:33 +0000)]
Merge "Support Asynchronous Loading of Animated Image" into devel/master
Seungho BAEK [Wed, 8 Jul 2020 01:44:02 +0000 (01:44 +0000)]
Merge "Add comment in the capture.h" into devel/master
David Steele [Mon, 6 Jul 2020 16:50:18 +0000 (17:50 +0100)]
Ensure curl redirection and proxy environment are honoured
Web redirection is ignored with the current curl settings.
Also, although curl is supposed to utilize http_proxy variable
in practice, it is ignoring it. Added code to check if it is set,
if so, use it.
Change-Id: I7a1d04bea3759aedeaeccd8c348be04d11b51a92
(cherry picked from commit
75d05ea14b1bead87a189f9bf388f8d45ecbcb87)
Seungho, Baek [Thu, 2 Jul 2020 01:51:45 +0000 (10:51 +0900)]
Add comment in the capture.h
- Add @return comment at the GetNativeImageSource()
Change-Id: Ic46eac21b4f138871ae5e1a7b9dc19140da85b9e
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Heeyong Song [Tue, 16 Jun 2020 02:42:02 +0000 (11:42 +0900)]
Support a frame rendered / presented callback
Change-Id: Ie6dfe10a1349c1c4c50ebf8b4005835b67b53c57
Adeel Kazmi [Fri, 3 Jul 2020 10:58:42 +0000 (10:58 +0000)]
Merge "Remove non-touch related deprecated APIs" into devel/master
Victor Cebollada [Fri, 3 Jul 2020 08:52:18 +0000 (09:52 +0100)]
[dali_1.9.19] Merge branch 'devel/master'
Change-Id: Id40e47fa80e95fa14d13dc89807f23b22f5666a8
Victor Cebollada [Fri, 3 Jul 2020 08:51:28 +0000 (09:51 +0100)]
DALi Version 1.9.19
Change-Id: Ice57b4885296e87263388471de36637706db5d6c
Seungho, Baek [Mon, 29 Jun 2020 09:24:29 +0000 (18:24 +0900)]
Support Asynchronous Loading of Animated Image
Change-Id: Ic896aff6252bc495227c355b7036ae6dd126b42d
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Richard Huang [Thu, 2 Jul 2020 09:52:00 +0000 (10:52 +0100)]
Remove non-touch related deprecated APIs
Change-Id: Id79594f52069c1c1bfba8d11e9571ba664531681
Adeel Kazmi [Mon, 29 Jun 2020 15:30:03 +0000 (16:30 +0100)]
Make WebP Support Optional
Change-Id: I770351aa726d240b8bff59bb0f8efeb7a98f511d
Victor Cebollada [Fri, 26 Jun 2020 14:40:40 +0000 (15:40 +0100)]
Fixes for the CMake build on MS-Windows.
Change-Id: I679b9909a6525406bb216d50557a93da9dfedc8e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Fri, 26 Jun 2020 10:52:29 +0000 (11:52 +0100)]
Try to get default EGL display connection if it fails to get native display connection
Change-Id: I1a633fd2244fdafb793eb761caad1887ebca32ae
György Straub [Fri, 26 Jun 2020 08:10:10 +0000 (09:10 +0100)]
[dali_1.9.18] Merge branch 'devel/master'
Change-Id: Ib1d4cadd1ea8d252cc0f41a42f0e3927da6cc589
György Straub [Fri, 26 Jun 2020 08:09:21 +0000 (09:09 +0100)]
DALi Version 1.9.18
Change-Id: I8bebd4cb9eb4595867c986dd4185330a2da664fa
Seungho, Baek [Wed, 10 Jun 2020 07:04:07 +0000 (16:04 +0900)]
Support WebP format
- Make animated-image-loading interface for gif and webp.
- Animated WebP requires WEBP_DEMUX_ABI_VERSION 0x0107 or later
Change-Id: I5331163e2b0d68a6ef7cb5a06d6e59a5140ffca9
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
huiyu.eun [Mon, 25 Nov 2019 08:58:43 +0000 (17:58 +0900)]
Add Component Application Structure
Add Component Application Structure
Change-Id: Iffd4743e5c056842d8daf461b96798ddab39a572
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Adeel Kazmi [Mon, 22 Jun 2020 16:15:54 +0000 (16:15 +0000)]
Merge "Fixed MS Windows min, max compile error." into devel/master
Victor Cebollada [Mon, 22 Jun 2020 14:02:23 +0000 (15:02 +0100)]
Fixed MS Windows min, max compile error.
Change-Id: I96d60fce295aae527313c24dd480b069466b21b3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
joogab yun [Mon, 22 Jun 2020 10:55:44 +0000 (10:55 +0000)]
Merge "The advance of the letters is too narrow. So, remove the floor." into devel/master
Anton Obzhirov [Tue, 14 Apr 2020 15:00:16 +0000 (16:00 +0100)]
Partial update implementation, first phase.
Change-Id: I222a1972d5727f6e01bb941b08339c38aad1546a
greynaga [Fri, 19 Jun 2020 11:03:43 +0000 (12:03 +0100)]
[dali_1.9.17] Merge branch 'devel/master'
Change-Id: Ief1c6874159be9fdac190fc16cae896c7d908f6d
greynaga [Fri, 19 Jun 2020 11:02:55 +0000 (12:02 +0100)]
DALi Version 1.9.17
Change-Id: I90e1e7cb6c5b49aa3a37e4d55358f331c26be257
Joogab Yun [Wed, 17 Jun 2020 07:13:03 +0000 (16:13 +0900)]
The advance of the letters is too narrow.
So, remove the floor.
Change-Id: Iae4c426819d7002ad1e4c7aab74818a3ef82aa30
Adeel Kazmi [Thu, 18 Jun 2020 11:02:18 +0000 (11:02 +0000)]
Merge "Image Usage Removal" into devel/master
Heeyong Song [Thu, 18 Jun 2020 06:42:22 +0000 (15:42 +0900)]
Fix feedback sound API
mm_sound_play_keysound() should be use with mm_sound_stop_keysound().
Change-Id: I4197a848508e12f880b30bded19d8c918b1af7bb
Adeel Kazmi [Wed, 17 Jun 2020 21:44:03 +0000 (22:44 +0100)]
Image Usage Removal
Change-Id: I7526f3659c8e04a94d03c91d27cd2c9239f6c800
Adeel Kazmi [Wed, 17 Jun 2020 09:24:35 +0000 (09:24 +0000)]
Merge "Replace some Dali::Actor public APIs with new properties" into devel/master
Richard Huang [Tue, 16 Jun 2020 11:12:51 +0000 (12:12 +0100)]
Replace some Dali::Actor public APIs with new properties
Change-Id: Ib6458aeead4d5fba99eef76aca97e6d670785c82
huiyu.eun [Tue, 16 Jun 2020 06:44:24 +0000 (15:44 +0900)]
Change unsetenv to setenv
unsetenv("AUL_LOADER_INIT") -> setenv("AUL_LOADER_INIT", "0", "1")
Change-Id: If5420fc0a3baed766f03486ae14571bdd3d87212
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Heeyong Song [Mon, 8 Jun 2020 09:41:09 +0000 (18:41 +0900)]
Throw an exception if the Adaptor is not instantiated
Change-Id: I707c2d351d4c28cfb05954cdd6d59c08269d8024
Adeel Kazmi [Fri, 12 Jun 2020 17:19:28 +0000 (18:19 +0100)]
BufferImage Usage Removal
Change-Id: I276e2b4d16448837581e5e1a376ada533d909761
Adeel Kazmi [Fri, 12 Jun 2020 15:35:50 +0000 (16:35 +0100)]
(Automated Tests) Sync with other repos
Change-Id: Id487a2b321389a7e4d847e88370f5829229f6043
Cheng-Shiun Tsai [Fri, 12 Jun 2020 09:07:55 +0000 (10:07 +0100)]
[dali_1.9.16] Merge branch 'devel/master'
Change-Id: Id4535a14f87ee7277b0767658e566c653b4d3bad
Cheng-Shiun Tsai [Fri, 12 Jun 2020 09:07:05 +0000 (10:07 +0100)]
DALi Version 1.9.16
Change-Id: I5f5924c2282e1f3e6ce76ecb5b4da8d594ea6238
Adeel Kazmi [Tue, 9 Jun 2020 21:23:48 +0000 (22:23 +0100)]
(Automated Tests) Sync with dali-core
Change-Id: I8d51346860aae31c5716c0e7efc77b0d852971f2
Anton Obzhirov [Fri, 5 Jun 2020 10:21:43 +0000 (11:21 +0100)]
[dali_1.9.15] Merge branch 'devel/master'
Change-Id: I2b606a92580a441071ac884f00c6c3b2e5a9d3b4
Anton Obzhirov [Fri, 5 Jun 2020 10:20:58 +0000 (11:20 +0100)]
DALi Version 1.9.15
Change-Id: I7b3ab70570a024c789754f36f7db863b845bd405
Richard Huang [Tue, 2 Jun 2020 16:29:15 +0000 (17:29 +0100)]
Further Setter/Getter public API removal from Dali::Actor
Change-Id: Ie9c1c5e92be1ee000d88879147aefd6699366df6
Heeyong Song [Tue, 2 Jun 2020 07:57:40 +0000 (07:57 +0000)]
Merge "Call PostRender method of the surface if needed" into devel/master
Wonsik Jung [Tue, 2 Jun 2020 00:24:41 +0000 (00:24 +0000)]
Merge "Update window's geometry to ecore_wl2." into devel/master
Heeyong Song [Tue, 19 May 2020 08:32:25 +0000 (17:32 +0900)]
Call PostRender method of the surface if needed
Change-Id: Ic5651f52dfa42b08a4bc514af765188310f8f863
Heeyong Song [Tue, 28 Apr 2020 05:34:50 +0000 (14:34 +0900)]
Add a thread mode
In case of ThreadMode::RUN_IF_REQUESTED, the update thread runs when the application requests rendering.
Change-Id: I8aac3fcd7fb802b0b8d5259fe40ecf14f7b905c3
Heeyong Song [Mon, 1 Jun 2020 08:06:06 +0000 (08:06 +0000)]
Merge "Delete multiple surfaces when the updated thread is destroyed" into devel/master
Adeel Kazmi [Fri, 29 May 2020 11:18:25 +0000 (12:18 +0100)]
[dali_1.9.14] Merge branch 'devel/master'
Change-Id: If1b8e7a8439849cd58d1aa70dfe611ff4e018e7f
Adeel Kazmi [Fri, 29 May 2020 11:17:39 +0000 (12:17 +0100)]
DALi Version 1.9.14
Change-Id: Id4f48e78c6a0b8bf816962ee823f5ccc5c50422d
Wonsik Jung [Fri, 29 May 2020 06:29:29 +0000 (15:29 +0900)]
Update window's geometry to ecore_wl2.
When the ecore wl2 window is resized or changed position then the window is hidden,
the window's position and size is not updated by the Tizen Display Server.
Because wayland protocol is destroyed by window's hidden.
To fix that, window's geometry is updated again before window is shown.
Change-Id: Ib7de2532476c175b5b8fa6643171f2a0a4ba8099
Daekwang Ryu [Wed, 27 May 2020 06:18:13 +0000 (15:18 +0900)]
Free an unnecessary variable anymore
The parameter of app_get_id() has to be freed when it is not necessary
anymore.
Change-Id: Ic8a85286fa40031b405443876f794adabe2da81e
Heeyong Song [Fri, 22 May 2020 07:23:43 +0000 (16:23 +0900)]
Delete multiple surfaces when the updated thread is destroyed
Change-Id: I1d2f1431f1b4bb827691e28bfffba96c542eb227
Seungho BAEK [Tue, 26 May 2020 23:28:36 +0000 (23:28 +0000)]
Merge "Remove Assert when NativeImageSource is reset" into devel/master
Adeel Kazmi [Tue, 26 May 2020 16:24:34 +0000 (16:24 +0000)]
Merge "Remove EGL surface in the update thread" into devel/master
Adeel Kazmi [Tue, 26 May 2020 16:24:17 +0000 (16:24 +0000)]
Merge "Fix DestroyContext bug" into devel/master
Seungho, Baek [Mon, 25 May 2020 02:41:52 +0000 (11:41 +0900)]
Remove Assert when NativeImageSource is reset
Change-Id: Icd5f4dd5e215a3d1fd3c3eaf8d980baaeb46822d
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
adam.b [Fri, 22 May 2020 09:54:44 +0000 (10:54 +0100)]
[dali_1.9.13] Merge branch 'devel/master'
Change-Id: I5748ebac7e1dd11d4613aa5aa68fc01cb4fa097e
adam.b [Fri, 22 May 2020 09:53:58 +0000 (10:53 +0100)]
DALi Version 1.9.13
Change-Id: I4790888b5a01884cd1d7059e46341b355b09e281
Heeyong Song [Wed, 13 May 2020 07:30:29 +0000 (16:30 +0900)]
Remove EGL surface in the update thread
Change-Id: Id29847f34c1094dc7ddc44b2afbff2ddb6f0d020
Heeyong Song [Fri, 22 May 2020 06:48:44 +0000 (15:48 +0900)]
Fix DestroyContext bug
Change-Id: I46d2806e48c6e4d3d7c97d94832e5ffa5147cb87
Adeel Kazmi [Wed, 20 May 2020 22:49:19 +0000 (22:49 +0000)]
Merge "Revert "Remove EGL surface in the update thread"" into devel/master
Adeel Kazmi [Wed, 20 May 2020 17:16:29 +0000 (17:16 +0000)]
Revert "Remove EGL surface in the update thread"
This reverts commit
5a03a49db1a8e90a7ee79cb225616f1d41747594.
Change-Id: Ie3453b21f519dfab7e4aec9e471e06eaa146ae8f
Richard Huang [Tue, 19 May 2020 12:46:03 +0000 (13:46 +0100)]
Remove some public Setter/Getter APIs from Dali::Actor
Change-Id: I0e4c42f7988b38b82956d628474103c90db0f407
Adeel Kazmi [Tue, 19 May 2020 09:00:28 +0000 (09:00 +0000)]
Merge "Add GetNativeId() in Window" into devel/master
Dongsug Song [Thu, 16 Apr 2020 11:39:32 +0000 (20:39 +0900)]
Add GetNativeId() in Window
Change-Id: I9724842abf0f84f0633a19bb173993357081feee
Heeyong Song [Wed, 13 May 2020 08:05:56 +0000 (17:05 +0900)]
Delete EglGraphics and shutdown EGL
Change-Id: Iaaa267481aad15172f8e9e26fd9cc85384dfbb83
Heeyong Song [Tue, 19 May 2020 01:09:11 +0000 (01:09 +0000)]
Merge "Remove EGL surface in the update thread" into devel/master
Adeel Kazmi [Fri, 15 May 2020 07:45:39 +0000 (07:45 +0000)]
Merge "DALi Version 1.9.12" into devel/master