Adam Bialogonski [Fri, 21 Jul 2023 09:43:32 +0000 (10:43 +0100)]
[dali_2.2.36] Merge branch 'devel/master'
Change-Id: I7a56d36d281daa0c1e5dfc0a37bd7aeb759b0752
Adam Bialogonski [Fri, 21 Jul 2023 09:42:45 +0000 (10:42 +0100)]
DALi Version 2.2.36
Change-Id: I45ed7668e6c65346e78bd29f00e13979ecf712ff
Eunki, Hong [Tue, 18 Jul 2023 02:04:13 +0000 (11:04 +0900)]
Change the name of CalculateScreenExtents
Change-Id: Ic27505f6a9b5f7bc85b0cd6b38b3d59b224da535
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Richard Huang [Fri, 14 Jul 2023 11:36:55 +0000 (12:36 +0100)]
[dali_2.2.35] Merge branch 'devel/master'
Change-Id: I53d8c212263d6fb315d684ad8e2505720045b7d4
Richard Huang [Fri, 14 Jul 2023 11:36:07 +0000 (12:36 +0100)]
DALi Version 2.2.35
Change-Id: I4f6702bbe2984b077aa70dba4979c41db4fd89ee
joogab.yun [Mon, 10 Jul 2023 05:40:56 +0000 (14:40 +0900)]
Binding IsFloatingModeEnabled
refer :
https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/295493/
Change-Id: I466f3a7744192f4d25e205e9136c7b64d89d01a1
David Steele [Fri, 7 Jul 2023 11:01:36 +0000 (12:01 +0100)]
[dali_2.2.34] Merge branch 'devel/master'
Change-Id: Id22c3421cfe5fa2dfa7185025539de6467433b69
David Steele [Fri, 7 Jul 2023 11:01:09 +0000 (12:01 +0100)]
DALi Version 2.2.34
Change-Id: Ie8280dd01d9bd9ee68d6750fc7e7450ad3d78021
David Steele [Thu, 6 Jul 2023 16:19:28 +0000 (16:19 +0000)]
Merge "Updated FrameCallback C# binding after FrameCallbackInterface is changed" into devel/master
Richard [Thu, 6 Jul 2023 09:42:59 +0000 (10:42 +0100)]
Updated FrameCallback C# binding after FrameCallbackInterface is changed
Change-Id: I30e78c5560c3efad14db50492c2b15192eed7a01
Eunki Hong [Tue, 4 Jul 2023 13:29:50 +0000 (22:29 +0900)]
Bind MotionData / MotionIndex / MotionValue
Bind public API for MotionData features.
Change-Id: I5a1cc1d08cde40c3ecb6ca59cc99605e145e1b32
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
Heeyong Song [Wed, 5 Jul 2023 00:03:53 +0000 (00:03 +0000)]
Merge "Fix build error for toolchain upgrade" into devel/master
joogab.yun [Tue, 4 Jul 2023 05:26:41 +0000 (14:26 +0900)]
Binding InterceptWheelSignal
refer : https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-core/+/295232/
Change-Id: I4184597665f60a67c6c4d52ea8e9d8842ba3d3bc
Heeyong Song [Mon, 3 Jul 2023 07:05:31 +0000 (16:05 +0900)]
Fix build error for toolchain upgrade
Change-Id: I2db38c59bd25e113e4ec609c6cd96517886c3395
David Steele [Fri, 30 Jun 2023 13:24:52 +0000 (13:24 +0000)]
Merge "DALi Version 2.2.33" into devel/master
Adeel Kazmi [Fri, 30 Jun 2023 13:18:11 +0000 (14:18 +0100)]
[dali_2.2.33] Merge branch 'devel/master'
Change-Id: I2f361e99db6f90e9131befd98a970a4cd54074ea
Adeel Kazmi [Fri, 30 Jun 2023 13:17:22 +0000 (14:17 +0100)]
DALi Version 2.2.33
Change-Id: Ie3bcae076631c910913a7c657594b1b6f96babbe
joogab.yun [Fri, 23 Jun 2023 08:09:43 +0000 (17:09 +0900)]
Binding FeedHover
Change-Id: Iaabd3ddcb935873b5d9587b9096c6a7dca1967a9
Heeyong Song [Thu, 22 Jun 2023 04:28:41 +0000 (13:28 +0900)]
Add SetPartialUpdateEnabled to Window
Change-Id: Idf3d13044db3eadfa2c8b562c0cd46d9624fac1d
Adam Bialogonski [Fri, 23 Jun 2023 10:04:33 +0000 (11:04 +0100)]
[dali_2.2.32] Merge branch 'devel/master'
Change-Id: I0a2aa981773cfa35861669e8dcec783237484b2e
Adam Bialogonski [Fri, 23 Jun 2023 10:03:42 +0000 (11:03 +0100)]
DALi Version 2.2.32
Change-Id: I92457f331d23a99dbf23c91a4b9f74d99f7dbe1f
Wonsik Jung [Thu, 22 Jun 2023 10:26:00 +0000 (10:26 +0000)]
Merge "Fix the missing code to generation argv string in UI threading case." into devel/master
Wonsik Jung [Thu, 22 Jun 2023 08:01:41 +0000 (17:01 +0900)]
Fix the missing code to generation argv string in UI threading case.
Fix the missing code to generation argv string for UI threading.
This string is from NUI.
Change-Id: I4c51b35a95e0bb992b555a76ebb8fd09c126aede
Eunki, Hong [Wed, 21 Jun 2023 02:39:16 +0000 (11:39 +0900)]
Bind some API for KeyFrames
Let we allow to change added keyframes.
Change-Id: I0dc53f1638186007f6c08970e423a0d8413f4141
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Eunki Hong [Mon, 15 May 2023 15:17:17 +0000 (00:17 +0900)]
Bind CalculateCurrentScreenPosition/Extents
Change-Id: I08df52b5101005ba5cc399ebebbf6a502e0463c1
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
joogab.yun [Tue, 20 Jun 2023 00:28:57 +0000 (09:28 +0900)]
Revert "Binding DeviceInfo event"
This reverts commit
ac02bfb0f939cbc2885418c498b0e1aa7ff2740c.
Change-Id: I7d41e80b7823f4a1b663be2a30fe793592f3b7ef
joogab yun [Mon, 19 Jun 2023 09:10:38 +0000 (09:10 +0000)]
Merge "Binding DeviceInfo event" into devel/master
seungho baek [Mon, 12 Jun 2023 04:45:49 +0000 (13:45 +0900)]
Add Light for Scene3D
Change-Id: Ie4da7d1878143769426a50ea9d315aafde4346d7
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
joogab.yun [Sun, 18 Jun 2023 04:25:34 +0000 (13:25 +0900)]
Binding DeviceInfo event
refer : https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/294039/
Change-Id: Ibb845d13689641167c605c74c8a3b3940454fed5
Richard Huang [Fri, 16 Jun 2023 13:49:47 +0000 (14:49 +0100)]
[dali_2.2.31] Merge branch 'devel/master'
Change-Id: I69cc8471b5b0e72b141a3480dcdc8fbe06eb653c
Richard Huang [Fri, 16 Jun 2023 13:48:59 +0000 (14:48 +0100)]
DALi Version 2.2.31
Change-Id: I81890193e52d86144d6166776061943ab71f7f5d
Heeyong Song [Tue, 30 May 2023 03:12:13 +0000 (12:12 +0900)]
Add EnableBackBuffer to NativeImageSource
Change-Id: If16357f5410159cdbb7554b1a12c4e05338ab121
dongsug song [Mon, 12 Jun 2023 11:32:58 +0000 (11:32 +0000)]
Merge "Unregister some callbacks when passed callback argument is null." into devel/master
huayong.xu [Fri, 9 Jun 2023 07:03:03 +0000 (15:03 +0800)]
Unregister some callbacks when passed callback argument is null.
Change-Id: I86e1e77eac20323d353693dffe7a64c4843d0810
Adeel Kazmi [Fri, 9 Jun 2023 09:52:43 +0000 (09:52 +0000)]
Merge "DALi Version 2.2.30" into devel/master
David Steele [Fri, 9 Jun 2023 09:50:53 +0000 (10:50 +0100)]
[dali_2.2.30] Merge branch 'devel/master'
Change-Id: Ibfaf522baf433639e0fac4469d7a7b27bd7c75d8
David Steele [Fri, 9 Jun 2023 09:50:25 +0000 (10:50 +0100)]
DALi Version 2.2.30
Change-Id: Iaf7134193d51e38e5b361426e916649fda2ebd0d
Daekwang Ryu [Fri, 31 Mar 2023 02:41:05 +0000 (11:41 +0900)]
Bind new WindowData
Change-Id: I8d2ee15e55b6cc0c45bf9330d9867cfc9c412a62
Richard Huang [Fri, 2 Jun 2023 10:38:12 +0000 (11:38 +0100)]
[dali_2.2.29] Merge branch 'devel/master'
Change-Id: Ibaef31389c13d24e1b32777df35caf488ea91dba
Richard Huang [Fri, 2 Jun 2023 10:37:25 +0000 (11:37 +0100)]
DALi Version 2.2.29
Change-Id: I896ed9e4f97c357935a3a24f965619255257766c
Artur Świgoń [Tue, 6 Sep 2022 12:11:48 +0000 (14:11 +0200)]
[AT-SPI] Add Table and TableCell interfaces
The purpose of these interfaces is to support Screen Reader operation with
tables and grids, often in combination with the Selection interface, for
example reading the row and column number when navigating a grid of items, or
selecting cells / rows / columns, as specified in the UX guide.
Change-Id: Ibafa1a5a8e9675d1b3967421aa31fba15ef42530
Heeyong Song [Tue, 30 May 2023 03:02:47 +0000 (12:02 +0900)]
Add KeepRendering to Window
Change-Id: If9c0142276d1ffa5dac7fb0aee3b98e8b254d79b
David Steele [Fri, 26 May 2023 11:42:31 +0000 (11:42 +0000)]
Merge "DALi Version 2.2.28" into devel/master
Adeel Kazmi [Fri, 26 May 2023 11:41:00 +0000 (12:41 +0100)]
[dali_2.2.28] Merge branch 'devel/master'
Change-Id: I24a01f067f397363dd362b5beef30ac8bea1f9cd
Adeel Kazmi [Fri, 26 May 2023 11:40:13 +0000 (12:40 +0100)]
DALi Version 2.2.28
Change-Id: Icc1eb5a12c7689efe5fd7413205413ce3bcb50b7
Bowon Ryu [Thu, 25 May 2023 06:43:21 +0000 (15:43 +0900)]
Add font thread sync creation option
https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/293316/
Change-Id: I68cdb949d6fce3d046a280cd80bd2f944a7e1d8a
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>
seungho baek [Thu, 25 May 2023 02:02:12 +0000 (11:02 +0900)]
Bind new constructor to Rotation by using Quaternion Vector4 as an input parameter
Change-Id: I87623d456222e7ecbfe529f02207656c474d79f8
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Jiyun Yang [Fri, 31 Mar 2023 06:46:24 +0000 (15:46 +0900)]
Revive currently referenced function by external module
Change-Id: I5726f0328ac5fd4aafdc9c346f2677891bbda440
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Wonsik Jung [Mon, 22 May 2023 01:53:24 +0000 (01:53 +0000)]
Merge "Binding window move/resize completed signals." into devel/master
David Steele [Fri, 19 May 2023 14:27:14 +0000 (15:27 +0100)]
[dali_2.2.27] Merge branch 'devel/master'
Change-Id: If945821b341fb2d0bb8b461028c06e3f0244da21
David Steele [Fri, 19 May 2023 14:26:47 +0000 (15:26 +0100)]
DALi Version 2.2.27
Change-Id: Iacc54a2b47d4fbbe7273bc12197eb121cee91603
Wonsik Jung [Fri, 19 May 2023 07:40:51 +0000 (16:40 +0900)]
Binding window move/resize completed signals.
This patch is for binding window move/resize completed signals.
When RequestMoveToServer() or RequestResizeToServer() is called, window start to be moved or resized by display server.
After the action is finished, server send the completed event.
This patch is to received the events.
Change-Id: I909a68f3d442a56c9f51d2e8e6c893eeca2ed19f
Eunki Hong [Tue, 16 May 2023 16:48:37 +0000 (01:48 +0900)]
Implement more visual setter for C#
Add more API for C# visual setter and getter.
Change-Id: Ifd537c5790ed69b904a82aaf29ee452bcb332d10
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
Eunki Hong [Tue, 16 May 2023 06:17:45 +0000 (06:17 +0000)]
Merge "Binds GetcurrentProperty" into devel/master
seungho baek [Mon, 15 May 2023 06:48:59 +0000 (15:48 +0900)]
Binds GetcurrentProperty
Change-Id: Ibbee93db81eaee6b57579ee5d389014d8d06725f
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Adeel Kazmi [Fri, 12 May 2023 09:59:05 +0000 (09:59 +0000)]
Merge "DALi Version 2.2.26" into devel/master
Richard Huang [Fri, 12 May 2023 09:49:01 +0000 (10:49 +0100)]
[dali_2.2.26] Merge branch 'devel/master'
Change-Id: I832fc518235df0be16b801d32b9145366cbdd220
Richard Huang [Fri, 12 May 2023 09:48:12 +0000 (10:48 +0100)]
DALi Version 2.2.26
Change-Id: Ib56a3900e45b0c08b8ec5a78b8245c4c561f5d92
Bowon Ryu [Fri, 12 May 2023 06:55:05 +0000 (06:55 +0000)]
Merge "Binding FontClientFontPreLoad API" into devel/master
Seungho BAEK [Thu, 11 May 2023 05:20:31 +0000 (05:20 +0000)]
Merge "Support BlendPoint of Animation" into devel/master
Bowon Ryu [Tue, 9 May 2023 10:46:36 +0000 (19:46 +0900)]
Binding FontClientFontPreLoad API
https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/292224/
Change-Id: I4f50ccaf4f6b456d294f79c569fb58e4642fca18
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>
Seoyeon Kim [Tue, 9 May 2023 08:01:47 +0000 (17:01 +0900)]
Gather #include directive into one place
- The scattered declarations (`#include`) are collected in one place,
making dali-wrap.cpp file much cleaner code.
- Removed duplicated declarations.
Change-Id: I8b994fbdb0aa8917eab727e8e8d86892aeee9efe
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
seungho baek [Mon, 8 May 2023 09:20:21 +0000 (18:20 +0900)]
Support BlendPoint of Animation
Change-Id: Id42fa5e5eec1d5a8f977ccce346efe37f360c68e
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Adam Bialogonski [Fri, 5 May 2023 10:21:53 +0000 (11:21 +0100)]
[dali_2.2.25] Merge branch 'devel/master'
Change-Id: I4751b8e86d3f0a103228bda4202e7dbe18073c88
Adam Bialogonski [Fri, 5 May 2023 10:21:05 +0000 (11:21 +0100)]
DALi Version 2.2.25
Change-Id: I635d73847fd508e030ff6966613b7b4c492dc18c
joogab.yun [Thu, 4 May 2023 08:46:16 +0000 (17:46 +0900)]
Binding GetDeviceClass and GetDeviceSubclass of touch event
Change-Id: I85bb807fb18d00eef1147b4ba860c0f755e434f2
joogab yun [Wed, 3 May 2023 07:12:35 +0000 (07:12 +0000)]
Merge "Binding WindowMouseInOutEventSignal" into devel/master
joogab.yun [Wed, 3 May 2023 05:02:35 +0000 (14:02 +0900)]
Binding EnableFocusIndicator and IsFocusIndicatorEnabled
Change-Id: I9cca8a3052a8fb63e8c30e06c07b34eee488c789
joogab.yun [Thu, 2 Mar 2023 04:07:21 +0000 (13:07 +0900)]
Binding WindowMouseInOutEventSignal
Change-Id: I9f7371673025f9c3e24d837ffb98b8e656e88bbf
Eunki Hong [Tue, 2 May 2023 08:03:54 +0000 (08:03 +0000)]
Merge "Bind bvh loader with use root translate offset or not" into devel/master
Seoyeon Kim [Tue, 2 May 2023 04:51:26 +0000 (04:51 +0000)]
Merge "Update the variable name in InputMethodContext" into devel/master
Eunki Hong [Fri, 28 Apr 2023 13:06:04 +0000 (13:06 +0000)]
Merge "Reuse internally created Key/Touch and reuse it" into devel/master
Adeel Kazmi [Fri, 28 Apr 2023 10:14:46 +0000 (10:14 +0000)]
Merge "DALi Version 2.2.24" into devel/master
Richard Huang [Fri, 28 Apr 2023 10:09:23 +0000 (11:09 +0100)]
[dali_2.2.24] Merge branch 'devel/master'
Change-Id: I5c453f218afe9ab5570078b4f1e1cf72112b1ae7
Richard Huang [Fri, 28 Apr 2023 10:08:34 +0000 (11:08 +0100)]
DALi Version 2.2.24
Change-Id: Ic56e77a2bcb238ca113ade67e8bca2e80a9d3ba6
Seoyeon Kim [Wed, 19 Apr 2023 12:06:56 +0000 (21:06 +0900)]
Update the variable name in InputMethodContext
- InputMethodContext C# binding file was generated automatically,
so all names are very disinformative and noninformative.
- Make them much easier to understand and search in the code.
Change-Id: If2520b9ad876e8943b44bedacd1bc8a2026d52a7
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Jiyun Yang [Thu, 27 Apr 2023 11:12:01 +0000 (20:12 +0900)]
Add GenerateUrl API to FrameBuffer
Change-Id: Iaf2994ee04eab51949df95399ab573b14ab90ffc
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Eunki, Hong [Mon, 24 Apr 2023 08:34:04 +0000 (17:34 +0900)]
Bind bvh loader with use root translate offset or not
Let we apply the original root node's position into bvh animation data or not.
Since we don't have AnimateBetweenBy, we should change each KeyFrames's value
with rootNode's position.
If AnimateBetweenBy feature prepared, we can remove this logic
Change-Id: I846b4714b52af13b533ae00cc75bbe2310234993
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
sunghyun kim [Wed, 26 Apr 2023 09:24:34 +0000 (09:24 +0000)]
Merge "Binding placeholder & transition effect" into devel/master
Eunki, Hong [Wed, 26 Apr 2023 09:15:03 +0000 (18:15 +0900)]
Reuse internally created Key/Touch and reuse it
Change-Id: I7bc136947e936b413d6f188bd1c3a8d5b28e4163
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Eunki, Hong [Wed, 26 Apr 2023 05:41:52 +0000 (14:41 +0900)]
Bind LoopingMode of Animation
Change-Id: Id397c83cd801aaaa07cdc08b34b806a18f26ba49
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
joogab.yun [Mon, 24 Apr 2023 09:16:05 +0000 (18:16 +0900)]
Binding SetTapRecognizerTime
refer : https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-core/+/291871/
Change-Id: Ie2f2513b580e28fd024419e309f212fe4d48d9c2
Adeel Kazmi [Thu, 20 Apr 2023 13:09:27 +0000 (14:09 +0100)]
[dali_2.2.23] Merge branch 'devel/master'
Change-Id: I7998adee7d5d286661e5e22494e7ed0e7fc88e08
Adeel Kazmi [Thu, 20 Apr 2023 13:08:40 +0000 (14:08 +0100)]
DALi Version 2.2.23
Change-Id: I75dafb44612d31f83086b46f76dafa6e5267280b
sunghyun kim [Wed, 29 Mar 2023 03:39:04 +0000 (12:39 +0900)]
Binding placeholder & transition effect
Change-Id: I3b0b5b8d5b8b66cada3047b5ac0c91d358cf2050
Eunki, Hong [Tue, 18 Apr 2023 08:19:57 +0000 (17:19 +0900)]
Bind bvh and facial animations loader from buffer
Change-Id: Icd479e52ab95b42d0faacb843f00e9fa8507aac1
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
dongsug song [Mon, 17 Apr 2023 07:54:54 +0000 (07:54 +0000)]
Merge "[AT-SPI] Implement Value::GetValueText()" into devel/master
Adam Bialogonski [Fri, 14 Apr 2023 09:26:33 +0000 (10:26 +0100)]
[dali_2.2.22] Merge branch 'devel/master'
Change-Id: Ia4985056c14a6b7bb9f6780c9f068295c99dd316
Adam Bialogonski [Fri, 14 Apr 2023 09:25:44 +0000 (10:25 +0100)]
DALi Version 2.2.22
Change-Id: I8167db6af9dfa986970260456af4d0651693a96e
Artur Świgoń [Thu, 13 Apr 2023 09:31:02 +0000 (11:31 +0200)]
[AT-SPI] Implement Value::GetValueText()
Change-Id: I00038f6e06166a3c3b6f12484f1a4ed12c30494b
Eunki Hong [Mon, 10 Apr 2023 16:48:28 +0000 (01:48 +0900)]
Bind EulerAngle setter/getter for Quaternion
Let we can use Rotation class by pitch/yaw/roll values in NUI side.
Change-Id: Ie034aa11045cbbb116f5f7aef3f0ddd424fdb6ef
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
David Steele [Thu, 6 Apr 2023 13:57:45 +0000 (13:57 +0000)]
Merge "DALi Version 2.2.21" into devel/master
David Steele [Thu, 6 Apr 2023 13:49:05 +0000 (14:49 +0100)]
[dali_2.2.21] Merge branch 'devel/master'
Change-Id: I66d0d17aa8e2278c13e44f4f933f77e75019c0a1
David Steele [Thu, 6 Apr 2023 13:48:16 +0000 (14:48 +0100)]
DALi Version 2.2.21
Change-Id: I1d8d6d64ed431792e084643241011eb4bd2fad51
dongsug song [Thu, 6 Apr 2023 05:41:28 +0000 (05:41 +0000)]
Merge "Use c-style string when webview loads contents." into devel/master
Seungho BAEK [Thu, 6 Apr 2023 04:25:46 +0000 (04:25 +0000)]
Merge "Binder for ModelNode, ModelPrimitive, Material" into devel/master
Eunki, Hong [Tue, 28 Mar 2023 08:01:06 +0000 (17:01 +0900)]
Bind Actor::LookAt API
Change-Id: Ia042e4f73cfbef379d8f1bc9ba4af89f723d50fd
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
seungho baek [Thu, 30 Mar 2023 10:59:06 +0000 (19:59 +0900)]
Binder for ModelNode, ModelPrimitive, Material
Change-Id: Iea6f62b3f54c89506d533c9a1f109004cecb420a
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
huayong.xu [Tue, 4 Apr 2023 07:43:25 +0000 (15:43 +0800)]
Use c-style string when webview loads contents.
Change-Id: Ic149e59f4f1a7cbe1d0d889f519a6bf0ba4c9bad
JIYUN YANG [Mon, 3 Apr 2023 01:46:05 +0000 (01:46 +0000)]
Merge "Remove regacy interop functions" into devel/master