Adeel Kazmi [Fri, 26 Mar 2021 11:01:54 +0000 (11:01 +0000)]
[dali_2.0.19] Merge branch 'devel/master'
Change-Id: Ib07f541cd82e12c8d1b48664b0cb7ea7a975b667
Adeel Kazmi [Fri, 26 Mar 2021 11:01:09 +0000 (11:01 +0000)]
DALi Version 2.0.19
Change-Id: I1472b26b068725f46d3e4107538c8c9a9be8a184
Wonsik Jung [Wed, 24 Mar 2021 02:35:24 +0000 (02:35 +0000)]
Merge "Support the synchronization of changing the video player's z-order" into devel/master
joogab yun [Mon, 22 Mar 2021 05:09:20 +0000 (05:09 +0000)]
Merge "Implement CameraView" into devel/master
David Steele [Fri, 19 Mar 2021 10:35:42 +0000 (10:35 +0000)]
[dali_2.0.18] Merge branch 'devel/master'
Change-Id: I323197f206e7239abca1ab24c2860f599f7a8150
David Steele [Fri, 19 Mar 2021 10:34:26 +0000 (10:34 +0000)]
DALi Version 2.0.18
Change-Id: Ie12ab6a648d9dd63365c6ed31dba719a1cc2af9f
Joogab Yun [Tue, 9 Mar 2021 05:29:59 +0000 (14:29 +0900)]
Implement CameraView
Change-Id: Icdcf0f3e734b3d5e3f28ac1edb54c7cac7e24578
Wonsik Jung [Mon, 1 Mar 2021 21:09:44 +0000 (06:09 +0900)]
Support the synchronization of changing the video player's z-order
If one video view moves the other above or below,
video player's z-order should be changed.
This patch is for supporting that.
In addition, the logs of mm player's error are enhanced.
Change-Id: Ib4be076f34c43fddf58965e9766be2f95d8dd2af
Adam Bialogonski [Fri, 12 Mar 2021 10:52:19 +0000 (10:52 +0000)]
[dali_2.0.17] Merge branch 'devel/master'
Change-Id: Ibe27d9f099f3da66cd51f819cb02f6af187b0fa3
Adam Bialogonski [Fri, 12 Mar 2021 10:51:34 +0000 (10:51 +0000)]
DALi Version 2.0.17
Change-Id: I6f7a7967a3167ec690928ccab05ad5612dddabb2
huayong.xu [Thu, 11 Mar 2021 02:39:05 +0000 (10:39 +0800)]
Reformat source code of tizen-web-engine-chromium.
clang-formattoer is used to format improperly code of
dali-extension in previous patch.
this patch is to restore the original format.
Change-Id: I79da58587214699e6411963c13257b3b55642e0e
JIYUN YANG [Thu, 11 Mar 2021 05:26:10 +0000 (05:26 +0000)]
Merge "Add APIs of webview settings." into devel/master
guowei.wang [Mon, 1 Mar 2021 06:45:19 +0000 (14:45 +0800)]
Add APIs of webview settings.
API added list:
ewk_settings_cache_builder_enabled_set
ewk_settings_uses_scrollbar_thumb_focus_notifications_set
ewk_settings_do_not_track_set
ewk_settings_auto_fitting_get
ewk_settings_auto_fitting_set
ewk_settings_plugins_enabled_get
ewk_settings_plugins_enabled_set
ewk_settings_private_browsing_enabled_get
ewk_settings_private_browsing_enabled_set
ewk_settings_link_magnifier_enabled_get
ewk_settings_link_magnifier_enabled_set
ewk_settings_uses_keypad_without_user_action_get
ewk_settings_uses_keypad_without_user_action_set
ewk_settings_autofill_password_form_enabled_get
ewk_settings_autofill_password_form_enabled_set
ewk_settings_form_candidate_data_enabled_get
ewk_settings_form_candidate_data_enabled_set
ewk_settings_text_selection_enabled_get
ewk_settings_text_selection_enabled_set
ewk_settings_text_autosizing_enabled_get
ewk_settings_text_autosizing_enabled_set
ewk_settings_uses_arrow_scroll_get
ewk_settings_uses_arrow_scroll_set
ewk_settings_clipboard_enabled_get
ewk_settings_clipboard_enabled_set
ewk_settings_ime_panel_enabled_get
ewk_settings_ime_panel_enabled_set
Change-Id: If865f7781a786dc9be0a3a1aa8b4578d79a9c9e0
Richard Huang [Fri, 5 Mar 2021 11:53:18 +0000 (11:53 +0000)]
[dali_2.0.16] Merge branch 'devel/master'
Change-Id: I1ebe59387514a9b68809b6e4957f54815fe7cbe9
Richard Huang [Fri, 5 Mar 2021 11:52:29 +0000 (11:52 +0000)]
DALi Version 2.0.16
Change-Id: I09d52867664128e24ce198325aad5cec81899ff2
David Steele [Fri, 26 Feb 2021 12:44:17 +0000 (12:44 +0000)]
[dali_2.0.15] Merge branch 'devel/master'
Change-Id: I6d33202196c469229ae663af10fdb9a9d05dee40
David Steele [Fri, 26 Feb 2021 12:43:48 +0000 (12:43 +0000)]
DALi Version 2.0.15
Change-Id: I230663ebbf0bed3f06966653c80b49dda5851db4
huayong.xu [Tue, 29 Dec 2020 07:53:16 +0000 (15:53 +0800)]
Add APIs to show javascript popup in web engine plugin.
Add callbacks for 'url,changed', 'load,progress', and javascript
alert/confirm/prompt.
Change-Id: I4ea5d35b20e6912c2164fe0c520ad20fb5530c26
Adeel Kazmi [Fri, 19 Feb 2021 10:51:49 +0000 (10:51 +0000)]
Merge "DALi Version 2.0.14" into devel/master
Adam Bialogonski [Fri, 19 Feb 2021 08:47:32 +0000 (08:47 +0000)]
[dali_2.0.14] Merge branch 'devel/master'
Change-Id: I95252437772efdb7fc393ad224ce3119aafcd283
Adam Bialogonski [Fri, 19 Feb 2021 08:46:43 +0000 (08:46 +0000)]
DALi Version 2.0.14
Change-Id: Ia5fa2ea692c4b7c0b2f71eb7f36b01e4795e557b
huayong.xu [Fri, 19 Feb 2021 05:13:44 +0000 (13:13 +0800)]
Break out of an infinite loop when removing web view.
There is an infinite loop when removing web view.
This patch is to fix it.
Change-Id: I8cdf1062dd99e9041af6633e79549b1e4130abbc
Adeel Kazmi [Fri, 12 Feb 2021 09:56:05 +0000 (09:56 +0000)]
[dali_2.0.13] Merge branch 'devel/master'
Change-Id: Ie6983b423fd13084ab9d30bdb2e81e882ae2a24b
Adeel Kazmi [Fri, 12 Feb 2021 09:55:08 +0000 (09:55 +0000)]
DALi Version 2.0.13
Change-Id: I4cd84546ac926527fdc8b028446b465e74e30ffb
Heeyong Song [Thu, 4 Feb 2021 10:34:20 +0000 (19:34 +0900)]
(Vector) Add a method to load a file
Change-Id: Ie5bdf576339e934fa70e523632fc604a084ce5dd
Richard Huang [Fri, 5 Feb 2021 11:59:48 +0000 (11:59 +0000)]
[dali_2.0.12] Merge branch 'devel/master'
Change-Id: I08805d660586bf05cefc24f9a44fd684a02c14ad
Richard Huang [Fri, 5 Feb 2021 11:58:52 +0000 (11:58 +0000)]
DALi Version 2.0.12
Change-Id: Ic36eb64db9f9284103de8fafe1437597c7f84fb5
JIYUN YANG [Mon, 1 Feb 2021 08:47:22 +0000 (08:47 +0000)]
Merge "Update position & size of web engine plugin." into devel/master
JIYUN YANG [Mon, 1 Feb 2021 05:11:29 +0000 (05:11 +0000)]
Merge "Fix svace issue in tizen-web-engine-chromium" into devel/master
David Steele [Fri, 29 Jan 2021 12:54:23 +0000 (12:54 +0000)]
[dali_2.0.11] Merge branch 'devel/master'
Change-Id: Ib3e663d77e89eab8912a364dbae156e59ab0e829
David Steele [Fri, 29 Jan 2021 12:53:53 +0000 (12:53 +0000)]
DALi Version 2.0.11
Change-Id: I913fae6c7dd28cdf36e85946f45cb2525e2ecd5e
Jiyun Yang [Fri, 29 Jan 2021 07:04:05 +0000 (16:04 +0900)]
Fix svace issue in tizen-web-engine-chromium
Change-Id: Ifa94987a189d5c428274412d51bfa12d8db46995
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
huayong.xu [Mon, 9 Nov 2020 10:27:45 +0000 (18:27 +0800)]
Update position & size of web engine plugin.
Originally position of web view is not changed.
This patch is to update position & size of web engine plugin when NUI
web view is moved.
Change-Id: I543deab14407262bd1e7d38a631fc608ad06d71c
huayong.xu [Thu, 21 Jan 2021 11:40:08 +0000 (19:40 +0800)]
improve code related to scroll APIs in web engine plugin.
THis improvement is suggested by Mr. Richard Huang.
Change-Id: I1a600aff60b9fe14263f987c78b4a7235c6fd2ff
JIYUN YANG [Tue, 26 Jan 2021 06:05:04 +0000 (06:05 +0000)]
Merge "Add some APIs into web engine plugin." into devel/master
Wonsik Jung [Tue, 26 Jan 2021 03:59:10 +0000 (03:59 +0000)]
Merge "Replace with new synchronization ECore-wl2 and mm player APIs" into devel/master
David Steele [Fri, 22 Jan 2021 17:28:23 +0000 (17:28 +0000)]
Merge "DALi Version 2.0.10" into devel/master
Adeel Kazmi [Fri, 22 Jan 2021 17:17:32 +0000 (17:17 +0000)]
[dali_2.0.10] Merge branch 'devel/master'
Change-Id: I5b5bd89c836d7aeee8abdad563feaf2d0489cb09
Adeel Kazmi [Fri, 22 Jan 2021 17:16:43 +0000 (17:16 +0000)]
DALi Version 2.0.10
Change-Id: I8c66ba63fb5b7c8a137b3cffa2cff1b2fd75f00c
huayong.xu [Mon, 21 Dec 2020 05:58:40 +0000 (13:58 +0800)]
Add some APIs into web engine plugin.
Create, GetTitle, GetFavicon, etc are added.
Change-Id: Ifdcbb31699f60ee2303fd3461dc4852f02195fea
huayong.xu [Thu, 10 Dec 2020 10:42:57 +0000 (18:42 +0800)]
Implement some new ewk apis in web engine plugin.
Support some new APIs, e.g. BackForwardList, Context, CookieManager,
Settings.
Change-Id: If21a797b9772e595ec0e7c6cd6eb1810adc5bcf0
JIYUN YANG [Mon, 18 Jan 2021 07:18:19 +0000 (07:18 +0000)]
Merge "Support scroll in web engine plugin." into devel/master
huayong.xu [Tue, 5 Jan 2021 07:03:52 +0000 (15:03 +0800)]
Support scroll in web engine plugin.
Some APIs related to scroll are supported.
Change-Id: I1767673dcd73c3bb0671966d10c7ac2c5be89c3d
adam.b [Fri, 15 Jan 2021 11:17:49 +0000 (11:17 +0000)]
[dali_2.0.9] Merge branch 'devel/master'
Change-Id: I9e4b662a59c7eed8fe1f93ed179d67ea4107492b
adam.b [Fri, 15 Jan 2021 11:17:04 +0000 (11:17 +0000)]
DALi Version 2.0.9
Change-Id: I35879710d40be7570258560d6e43c8f028483df8
Wonsik Jung [Sun, 3 Jan 2021 16:37:10 +0000 (01:37 +0900)]
Replace with new synchronization ECore-wl2 and mm player APIs
Replace with new synchronization ECore-Wl2 and mm Player APIs.
It is to support mulitple video player.
Change-Id: Ib26818ce6a813bf4db6d90e47a41f2537fd7e1e9
Heeyong Song [Thu, 24 Dec 2020 03:58:45 +0000 (12:58 +0900)]
(Vector) Add error check code
Change-Id: I641f60de8e0b35bfa8a36100b8962c5d93352092
Richard Huang [Fri, 8 Jan 2021 14:37:00 +0000 (14:37 +0000)]
[dali_2.0.8] Merge branch 'devel/master'
Change-Id: Ib14a1680dbd312f4993834b490755d6bdbb2dcd1
Richard Huang [Fri, 8 Jan 2021 14:36:12 +0000 (14:36 +0000)]
DALi Version 2.0.8
Change-Id: Ifbffd9eba398419332032c1e4a2163720186539d
JIYUN YANG [Wed, 6 Jan 2021 03:42:43 +0000 (03:42 +0000)]
Merge "Set focus to ewk view." into devel/master
György Straub [Thu, 24 Dec 2020 07:50:51 +0000 (07:50 +0000)]
[dali_2.0.7] Merge branch 'devel/master'
Change-Id: I9ad23058ffb175f11c5cc9328a15ff524a7a7ab4
György Straub [Thu, 24 Dec 2020 07:49:39 +0000 (07:49 +0000)]
DALi Version 2.0.7
Change-Id: I3c2454d7c5b8c158bee2e24da990cc1bd8a86f86
Adeel Kazmi [Fri, 18 Dec 2020 11:48:35 +0000 (11:48 +0000)]
Merge "DALi Version 2.0.6" into devel/master
adam.b [Fri, 18 Dec 2020 11:09:44 +0000 (11:09 +0000)]
[dali_2.0.6] Merge branch 'devel/master'
Change-Id: I224be9e7e8aa51516a2b4f5a7d297f2024a7bee9
adam.b [Fri, 18 Dec 2020 11:08:56 +0000 (11:08 +0000)]
DALi Version 2.0.6
Change-Id: I04f5576ccdbc5b2add41552a4c222b79487106af
JunsuChoi [Mon, 7 Dec 2020 07:26:40 +0000 (16:26 +0900)]
TizenVectorImageRenderer: Use size() instead of transformation
With ThorVG's Picture supporting size API, there is no need for transformation.
When size() is determined, SVG is adjusted according to content.
And remove related parameter(scale) as it is not needed.
Change-Id: I4ad833ec0a63ad29a1adfa87fef472afecd2a6f7
huayong.xu [Thu, 12 Nov 2020 06:20:18 +0000 (14:20 +0800)]
Set focus to ewk view.
Set focus to ewk view and evas window when web view is focused.
Change-Id: I8d3ee6070afe3bf9bd1928fb1231579bc54bc96d
David Steele [Fri, 11 Dec 2020 12:11:54 +0000 (12:11 +0000)]
[dali_2.0.5] Merge branch 'devel/master'
Change-Id: I9c21dbab8a8de41e2a130f646775372fafcf4ec7
David Steele [Fri, 11 Dec 2020 12:10:57 +0000 (12:10 +0000)]
DALi Version 2.0.5
Change-Id: Ie202c67bbb8a111df3412b23bdf27c2408d72ae8
Joogab Yun [Wed, 9 Dec 2020 11:22:15 +0000 (20:22 +0900)]
Use different scripts for specific targets
Change-Id: I8ab91c5e2b5692afb5cb6bb5630e4e12118476d7
Adeel Kazmi [Fri, 4 Dec 2020 14:58:19 +0000 (14:58 +0000)]
[dali_2.0.4] Merge branch 'devel/master'
Change-Id: I5a9fe9e227c4081ca017627a1572fa6daf545a0f
Adeel Kazmi [Fri, 4 Dec 2020 14:57:34 +0000 (14:57 +0000)]
DALi Version 2.0.4
Change-Id: I843c5d8cc2d229e409c521429c1c73c76e76f36f
Richard Huang [Fri, 27 Nov 2020 11:58:22 +0000 (11:58 +0000)]
[dali_2.0.3] Merge branch 'devel/master'
Change-Id: I4ab53fedf7d4a7d7ffc6762e29876e9b54e624e6
Richard Huang [Fri, 27 Nov 2020 11:57:36 +0000 (11:57 +0000)]
DALi Version 2.0.3
Change-Id: I2c789e67f2a1f789b76cde616c4102491e267b14
Joogab Yun [Mon, 23 Nov 2020 05:02:25 +0000 (14:02 +0900)]
Use different scripts for specific targets
Change-Id: Icbb8d965ecbe4eb8539fcb2b6e3c11589947a811
György Straub [Fri, 20 Nov 2020 07:48:01 +0000 (07:48 +0000)]
[dali_2.0.2] Merge branch 'devel/master'
Change-Id: Icd916326f02014f56f05cdfa4b376b7140b20f00
György Straub [Fri, 20 Nov 2020 07:46:51 +0000 (07:46 +0000)]
DALi Version 2.0.2
Change-Id: I8f23a821e21d0109663ffbe9c9ccff82af3b0296
Jiyun Yang [Tue, 17 Nov 2020 09:15:14 +0000 (18:15 +0900)]
Disable viewport meta tag false
This fixes WebView size fitting issue in mobile profile.
Change-Id: I8a55a83d9d2c1b7977fcb67b4883900e479f496d
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Cheng-Shiun Tsai [Fri, 13 Nov 2020 14:54:46 +0000 (14:54 +0000)]
[dali_2.0.1] Merge branch 'devel/master'
Change-Id: I92540a430b46671114958928f558ab51d19fcdbc
Cheng-Shiun Tsai [Fri, 13 Nov 2020 14:53:57 +0000 (14:53 +0000)]
DALi Version 2.0.1
Change-Id: I7be73efd07c9d00a426fff43cf75994dffbd0172
Wonsik Jung [Wed, 11 Nov 2020 09:25:30 +0000 (09:25 +0000)]
Merge "Fix to package vector-image-renderer properly." into devel/master
Seungho BAEK [Wed, 11 Nov 2020 03:08:43 +0000 (03:08 +0000)]
Merge "Blend Equation Advanced Supporting" into devel/master
Hermet Park [Tue, 10 Nov 2020 11:27:22 +0000 (20:27 +0900)]
Fix to package vector-image-renderer properly.
vector-image-renderer is supposed to be in Tizen 6.0 above.
There was a missing configuration define -tizen_65_or_greater- that is used in configure.
It occured build break in Tizen 6.5.
Now it's fixed.
Change-Id: I140cf189750a9bb53fa661594562feb323134418
Adeel Kazmi [Fri, 6 Nov 2020 09:19:28 +0000 (09:19 +0000)]
[dali_2.0.0] Merge branch 'devel/master'
Change-Id: I1393fea78180c951c468d5ad586da670e229382f
Adeel Kazmi [Fri, 6 Nov 2020 09:18:39 +0000 (09:18 +0000)]
DALi Version 2.0.0
Change-Id: If84985a12f443b06ae6b04f492fcfdfa27684150
David Steele [Fri, 30 Oct 2020 14:47:50 +0000 (14:47 +0000)]
Merge "DALi Version 1.9.36" into devel/master
David Steele [Fri, 30 Oct 2020 14:34:45 +0000 (14:34 +0000)]
[dali_1.9.36] Merge branch 'devel/master'
Change-Id: Ic41a2c757d5e35dceee10877a5399c63da8266bb
David Steele [Fri, 30 Oct 2020 14:33:58 +0000 (14:33 +0000)]
DALi Version 1.9.36
Change-Id: I93f347a38be0b1a739399c7b14709fe34bfa64b2
seungho [Wed, 28 Oct 2020 02:30:55 +0000 (11:30 +0900)]
Blend Equation Advanced Supporting
Change-Id: Iee2758a9cc082136c95bb0deb684fbebef0fc883
Signed-off-by: seungho <seungho@seungho.tn.corp.samsungelectronics.net>
Artur Świgoń [Wed, 22 Jul 2020 09:38:59 +0000 (11:38 +0200)]
[AT-SPI] Remove AccessibilityAdaptor
Change-Id: If7961ebfe4b87d5a4cfaf52f87f493b09a1092f0
adam.b [Fri, 23 Oct 2020 10:46:30 +0000 (11:46 +0100)]
[dali_1.9.35] Merge branch 'devel/master'
Change-Id: Iffd9077fe73de7b33790d1ebc2a7b606ffc87ad7
adam.b [Fri, 23 Oct 2020 10:45:36 +0000 (11:45 +0100)]
DALi Version 1.9.35
Change-Id: I5e3f988a3c667d01331f0406cf83e703cea079c6
Heeyong Song [Tue, 20 Oct 2020 08:31:22 +0000 (17:31 +0900)]
(Vector) Ignore previous image when the queue is full
Change-Id: Icd1a1fdabe75cd01e73dade6c5109d3cf6229e23
David Steele [Tue, 20 Oct 2020 09:35:40 +0000 (10:35 +0100)]
Changed to use C++17 for building
Change-Id: I9ac107a7791f615574eef7f0f10a067398f567f8
Richard Huang [Fri, 16 Oct 2020 10:34:57 +0000 (11:34 +0100)]
[dali_1.9.34] Merge branch 'devel/master'
Change-Id: I819030f34b82363948a71dc68aa6fd737e604a8e
Richard Huang [Fri, 16 Oct 2020 10:32:57 +0000 (11:32 +0100)]
DALi Version 1.9.34
Change-Id: Ia47aa58eb5973a074fc89a3e402d0ffae0b87555
György Straub [Fri, 9 Oct 2020 13:07:34 +0000 (14:07 +0100)]
[dali_1.9.33] Merge branch 'devel/master'
Change-Id: I80b1b72ef2967e35effe2c10ad8ce768bb2a4dce
György Straub [Fri, 9 Oct 2020 13:06:35 +0000 (14:06 +0100)]
DALi Version 1.9.33
Change-Id: I48e9f09907064dc0a32dfa01d7692a7deaee538a
Heeyong Song [Mon, 28 Sep 2020 10:47:47 +0000 (19:47 +0900)]
Refactor VectorImageRenderer
Change-Id: I5d6ed06df88d9052ab4741fabbb2a2f0e3120fe9
Cheng-Shiun Tsai [Fri, 2 Oct 2020 09:47:25 +0000 (10:47 +0100)]
[dali_1.9.32] Merge branch 'devel/master'
Change-Id: I9d306dc3a78d301476813beae2bbe87410350521
Cheng-Shiun Tsai [Fri, 2 Oct 2020 09:46:56 +0000 (10:46 +0100)]
DALi Version 1.9.32
Change-Id: I655ad4546326759f2f0f5eb10f43a6744083f422
Adeel Kazmi [Fri, 25 Sep 2020 10:59:29 +0000 (11:59 +0100)]
[dali_1.9.31] Merge branch 'devel/master'
Change-Id: I20ee6af6bdd13de2067ac766f3e64d40ea619d93
Adeel Kazmi [Fri, 25 Sep 2020 10:58:42 +0000 (11:58 +0100)]
DALi Version 1.9.31
Change-Id: If44a3a6a3523992a35bfcf20555e5a558964786c
Hermet Park [Wed, 23 Sep 2020 07:29:31 +0000 (16:29 +0900)]
Enable VectorImageRender only when tizen 6.5 or above.
* ThorVG package is not supported in Tizen 6.0
Change-Id: Ia473cde11b936ab938254dd64f617a3d85c721d9
JunsuChoi [Tue, 28 Jul 2020 04:59:14 +0000 (13:59 +0900)]
Introduce TizenVectorImageRenderer
The TizenVectorImageRenderer is VectorImageRendererPlugin for the Tizen.
The TizenVectorImageRenderer rasterizes the vector image using the thorvg api
and returns rasterized buffer.
GL rendering is not supported yet. SW Raterize only.
Change-Id: Id717ffa305403e48af0f16beb92916793284513b
David Steele [Fri, 18 Sep 2020 10:35:59 +0000 (11:35 +0100)]
[dali_1.9.30] Merge branch 'devel/master'
Change-Id: I00d17875327a8778aeeaa729b52fe398827f88df
David Steele [Fri, 18 Sep 2020 10:35:28 +0000 (11:35 +0100)]
DALi Version 1.9.30
Change-Id: Ie4a68e0b96bd17515d66cc4c71ca4d0fe5fd271d
adam.b [Fri, 11 Sep 2020 11:57:59 +0000 (12:57 +0100)]
[dali_1.9.29] Merge branch 'devel/master'
Change-Id: Ib31b1ab3a3519aaa0c26de5cd6d6fc22defbae86
adam.b [Fri, 11 Sep 2020 11:57:07 +0000 (12:57 +0100)]
DALi Version 1.9.29
Change-Id: I1abfd0ef7c874855aae69e4513b7121b0ba42bd6
David Steele [Fri, 4 Sep 2020 10:53:24 +0000 (10:53 +0000)]
Merge "DALi Version 1.9.28" into devel/master