WonYoung Choi [Mon, 14 Aug 2017 07:14:19 +0000 (16:14 +0900)]
Remove generating dummy assemblies
It moves to tizen branch
Change-Id: Ibd71df5257dbb191b6479ee9d2eaa8f1d2fdddc5
WonYoung Choi [Mon, 14 Aug 2017 00:38:57 +0000 (09:38 +0900)]
Add Tizen.NET.Dummy project to create dummy assemblies of Tizen.NET
Change-Id: Ia9a3891bd2153b899f1875fee198073b8601ba15
WonYoung Choi [Fri, 11 Aug 2017 05:22:04 +0000 (14:22 +0900)]
Suppress the warning CS1570
Change-Id: Ic6dd8a2884159f35e90ce82a41d21c3d5abe0d0e
sung-su.kim [Fri, 11 Aug 2017 04:54:25 +0000 (13:54 +0900)]
Add solution files
Change-Id: I15251a8116e465b9e82fbcb959d4c4a29cabf49d
WonYoung Choi [Fri, 11 Aug 2017 03:05:42 +0000 (03:05 +0000)]
Merge "Fix path in nuspec files"
WonYoung Choi [Fri, 11 Aug 2017 02:58:03 +0000 (11:58 +0900)]
Fix path in nuspec files
Change-Id: Ic4a97e044a6614bb87ce4718e46921c88e56f4ae
WonYoung Choi [Fri, 11 Aug 2017 02:22:53 +0000 (11:22 +0900)]
Fix CRLF to LF in some files
Change-Id: I2c9244bdc5c5dfa252a8d421f4f8d340b61817b9
WonYoung Choi [Fri, 11 Aug 2017 01:18:49 +0000 (10:18 +0900)]
Add Tizen.NET and Tizen.NET.Private packaging files
Change-Id: I0e57034dc4760805c0282ed0abbfc7c407af7f69
WonYoung Choi [Thu, 10 Aug 2017 05:44:07 +0000 (14:44 +0900)]
Change .csproj files of modules to use common build configuration
Change-Id: I2ae51d5fd84ee22195637fd733d02b920f475f08
WonYoung Choi [Thu, 10 Aug 2017 03:06:44 +0000 (12:06 +0900)]
Add LICENSE file
Change-Id: I3d7799275de95e79b65d0993d2a57cf745ad8ef3
WonYoung Choi [Thu, 10 Aug 2017 03:06:27 +0000 (12:06 +0900)]
Add .gitignore and .gitattributes
Change-Id: I431a8539a23472e47e7c5ceecddaf42210a4f127
WonYoung Choi [Thu, 10 Aug 2017 03:01:41 +0000 (12:01 +0900)]
Remove unnecessary files
Change-Id: I4195bb7886884e982a5a37f39d6a059bac2dc9b4
WonYoung Choi [Thu, 10 Aug 2017 02:41:30 +0000 (11:41 +0900)]
Merge remote-tracking branch 'wifi-direct/tizen'
Change-Id: I280b4b861498db30b7be43904156f3016cc1a236
WonYoung Choi [Thu, 10 Aug 2017 02:38:46 +0000 (11:38 +0900)]
Merge remote-tracking branch 'wifi/tizen'
Change-Id: I408ad30cdb75b8a8d5a7d2255abd2fda6fee33c7
WonYoung Choi [Thu, 10 Aug 2017 02:36:05 +0000 (11:36 +0900)]
Merge remote-tracking branch 'widget-viewer/tizen'
Change-Id: Id9c06575cecab4c88080cbbc84df76ddbf247d54
WonYoung Choi [Thu, 10 Aug 2017 02:33:28 +0000 (11:33 +0900)]
Merge remote-tracking branch 'widget-control/tizen'
Change-Id: I3c75929300c3fd488d75f9f2406680564848009c
WonYoung Choi [Thu, 10 Aug 2017 02:30:54 +0000 (11:30 +0900)]
Merge remote-tracking branch 'widget-application/tizen'
Change-Id: I436a32ccdaaba601c85d9003d1ab431301bcac7c
WonYoung Choi [Thu, 10 Aug 2017 02:25:59 +0000 (11:25 +0900)]
Merge remote-tracking branch 'webview/tizen'
Change-Id: Ia629bb03e0ded6174380dc2a77dee41c79f32579
WonYoung Choi [Thu, 10 Aug 2017 02:23:29 +0000 (11:23 +0900)]
Merge remote-tracking branch 'watch-application/tizen'
Change-Id: I9933f9c6fddc3db757d3106964cf671043eb7947
WonYoung Choi [Thu, 10 Aug 2017 02:23:23 +0000 (11:23 +0900)]
Merge remote-tracking branch 'usb/tizen'
Change-Id: I88cb52a25306bd05ff614f6857ad444de4c505f8
WonYoung Choi [Thu, 10 Aug 2017 02:20:55 +0000 (11:20 +0900)]
Merge remote-tracking branch 'uix-voice-control/tizen'
Change-Id: Ieb31b8243d686d8c76161cf0ef94b1d8f30a5ceb
WonYoung Choi [Thu, 10 Aug 2017 02:18:27 +0000 (11:18 +0900)]
Merge remote-tracking branch 'uix-tts-engine/tizen'
Change-Id: Id80e07122b02498edc0db8f9578d1c15968f1513
WonYoung Choi [Thu, 10 Aug 2017 02:16:02 +0000 (11:16 +0900)]
Merge remote-tracking branch 'uix-tts/tizen'
Change-Id: Iecd56ac0a68cfe3321778d24a650ef9ff6cd2e23
WonYoung Choi [Thu, 10 Aug 2017 02:13:39 +0000 (11:13 +0900)]
Merge remote-tracking branch 'uix-stt-engine/tizen'
Change-Id: Ifc1bcd856afde6e2867ddaa5f58d4071c3c5a8b8
WonYoung Choi [Thu, 10 Aug 2017 02:11:16 +0000 (11:11 +0900)]
Merge remote-tracking branch 'uix-stt/tizen'
Change-Id: Ia70cda991b74f5ed5ad2506b62be1794f7e8ac44
WonYoung Choi [Thu, 10 Aug 2017 02:08:55 +0000 (11:08 +0900)]
Merge remote-tracking branch 'uix-inputmethod-manager/tizen'
Change-Id: I820f5db5e35c098b032f8266824db0e43e8fb535
WonYoung Choi [Thu, 10 Aug 2017 02:06:35 +0000 (11:06 +0900)]
Merge remote-tracking branch 'uix-inputmethod/tizen'
Change-Id: I1fb22f2267bb4f6e332aa6723188168328cef517
WonYoung Choi [Thu, 10 Aug 2017 02:04:12 +0000 (11:04 +0900)]
Merge remote-tracking branch 'trace/tizen'
Change-Id: I02944c6647888ac89c446544b5a104649cbcf707
WonYoung Choi [Thu, 10 Aug 2017 02:01:48 +0000 (11:01 +0900)]
Merge remote-tracking branch 'tizen-platform-config/tizen'
Change-Id: I35f7a582ab84b13c2ba62af7e0024ec036e612a4
WonYoung Choi [Thu, 10 Aug 2017 01:59:15 +0000 (10:59 +0900)]
Merge remote-tracking branch 'tizen/tizen'
Change-Id: I47db7228d80714dae0347cb6875e955d0bdf46f8
WonYoung Choi [Thu, 10 Aug 2017 01:56:57 +0000 (10:56 +0900)]
Merge remote-tracking branch 'telephony/tizen'
Change-Id: I9754c24d829d803dc3d7283e86b883a7b5f3a33a
WonYoung Choi [Thu, 10 Aug 2017 01:52:31 +0000 (10:52 +0900)]
Merge remote-tracking branch 'tapi/tizen'
Change-Id: Ibe44940b505a9eb1fc987ec93531c8ac9e351a95
WonYoung Choi [Thu, 10 Aug 2017 01:50:18 +0000 (10:50 +0900)]
Merge remote-tracking branch 'system-settings/tizen'
Change-Id: I9163d6966c2fc4302ac0451ea08707fca542f8ec
WonYoung Choi [Thu, 10 Aug 2017 01:48:08 +0000 (10:48 +0900)]
Merge remote-tracking branch 'system/tizen'
Change-Id: I5d1f95f95e7d3248d0f07ed6dbc712c07bf4c6d5
WonYoung Choi [Thu, 10 Aug 2017 01:48:04 +0000 (10:48 +0900)]
Merge remote-tracking branch 'sync-manager/tizen'
Change-Id: I700d5951f734142589b80c774b159ab7b5ff3c9d
WonYoung Choi [Thu, 10 Aug 2017 01:46:00 +0000 (10:46 +0900)]
Merge remote-tracking branch 'storage/tizen'
Change-Id: I6074734d2f567b5dd27c4632ecb1214c52c9034b
WonYoung Choi [Thu, 10 Aug 2017 01:43:58 +0000 (10:43 +0900)]
Merge remote-tracking branch 'smartcard/tizen'
Change-Id: I43e445ddf3b52982132a792f5c3f7236a30f5f65
WonYoung Choi [Thu, 10 Aug 2017 01:43:54 +0000 (10:43 +0900)]
Merge remote-tracking branch 'shortcut/tizen'
Change-Id: I71431b581fd42fc6c532855014f8efcf8d6078e5
WonYoung Choi [Thu, 10 Aug 2017 01:41:49 +0000 (10:41 +0900)]
Merge remote-tracking branch 'sensor/tizen'
Change-Id: I82bdcb421300c003955216493e4ed0a3f0045779
WonYoung Choi [Thu, 10 Aug 2017 01:37:53 +0000 (10:37 +0900)]
Merge remote-tracking branch 'security/tizen'
Change-Id: Ifefaba4729412ee90514750a1c64eeb3fd032daf
WonYoung Choi [Thu, 10 Aug 2017 01:35:55 +0000 (10:35 +0900)]
Merge remote-tracking branch 'push/tizen'
Change-Id: Ia621cb6b9207175b5ff44196d7b967e6312cea37
WonYoung Choi [Thu, 10 Aug 2017 01:34:04 +0000 (10:34 +0900)]
Merge remote-tracking branch 'phonenumber-utils/tizen'
Change-Id: Icbb48e080ec592981104cc1bbfdbdeaeb4f04c4a
WonYoung Choi [Thu, 10 Aug 2017 01:32:10 +0000 (10:32 +0900)]
Merge remote-tracking branch 'oauth2/tizen'
Change-Id: I7d2b5ba5b906de18ab46232c451f50155be7a056
WonYoung Choi [Thu, 10 Aug 2017 01:25:16 +0000 (10:25 +0900)]
Merge remote-tracking branch 'nui/tizen'
Change-Id: Ic96b781355bafc39e353b99d7c72dc81a706e70a
WonYoung Choi [Thu, 10 Aug 2017 01:23:38 +0000 (10:23 +0900)]
Merge remote-tracking branch 'nsd/tizen'
Change-Id: I3be4170b7e32cab3824b62800e4cbd2f3e7b82c1
WonYoung Choi [Thu, 10 Aug 2017 01:22:14 +0000 (10:22 +0900)]
Merge remote-tracking branch 'nfc/tizen'
Change-Id: Ia78eb2fa437d9ecd1a598793fb7516b8e5d9dbbe
WonYoung Choi [Thu, 10 Aug 2017 01:07:10 +0000 (10:07 +0900)]
Merge remote-tracking branch 'multimedia/tizen'
Change-Id: I64d2b29be0cb1982aeb88441cd600b9659a5929a
WonYoung Choi [Thu, 10 Aug 2017 01:06:06 +0000 (10:06 +0900)]
Merge remote-tracking branch 'mtp/tizen'
Change-Id: I01fc9e20f908aef3a131244ada144c8a5ead5082
WonYoung Choi [Thu, 10 Aug 2017 01:05:11 +0000 (10:05 +0900)]
Merge remote-tracking branch 'mime-type/tizen'
Change-Id: If74102340beb8d9edde382b675377cfbfc5ea6bf
WonYoung Choi [Thu, 10 Aug 2017 01:04:19 +0000 (10:04 +0900)]
Merge remote-tracking branch 'messaging/tizen'
Change-Id: I78d17674dad1b96e1d92d371af6b0c686fbd6964
WonYoung Choi [Thu, 10 Aug 2017 01:04:17 +0000 (10:04 +0900)]
Merge remote-tracking branch 'mediacodec/tizen'
Change-Id: I823ebf7260547155d05def23bf8b5526c69a940a
WonYoung Choi [Thu, 10 Aug 2017 01:03:25 +0000 (10:03 +0900)]
Merge remote-tracking branch 'media-key/tizen'
Change-Id: Ifad1c1bf932915691318c4f9e2d38ea0427d9929
WonYoung Choi [Thu, 10 Aug 2017 01:02:34 +0000 (10:02 +0900)]
Merge remote-tracking branch 'media-content/tizen'
Change-Id: I97b37cfee6a2477e74c89c7719ee5ba79d801169
WonYoung Choi [Thu, 10 Aug 2017 01:00:30 +0000 (10:00 +0900)]
Merge remote-tracking branch 'maps/tizen'
Change-Id: I6256c0f32de88864e632651041e21ba498e564f3
WonYoung Choi [Thu, 10 Aug 2017 00:59:47 +0000 (09:59 +0900)]
Merge remote-tracking branch 'log/tizen'
Change-Id: I2e7bfebd1b94badf69190bec4474e0eda27e3c00
WonYoung Choi [Thu, 10 Aug 2017 00:59:04 +0000 (09:59 +0900)]
Merge remote-tracking branch 'location/tizen'
Change-Id: Ibf6db4ad3c3c2ae073a5701e50bd823e39a24b3d
WonYoung Choi [Thu, 10 Aug 2017 00:56:22 +0000 (09:56 +0900)]
Merge remote-tracking branch 'libteec/tizen'
Change-Id: Idf3206f1620f206891812b336c705bac38166ced
WonYoung Choi [Thu, 10 Aug 2017 00:55:42 +0000 (09:55 +0900)]
Merge remote-tracking branch 'iotcon/tizen'
Change-Id: I80a395ac2b6da8d9c362c49f98ab122bd057c7eb
WonYoung Choi [Thu, 10 Aug 2017 00:55:05 +0000 (09:55 +0900)]
Merge remote-tracking branch 'information/tizen'
Change-Id: Ie4a274a917b279ae9f91e80d4f7e09e02666670f
WonYoung Choi [Thu, 10 Aug 2017 00:54:28 +0000 (09:54 +0900)]
Merge remote-tracking branch 'geofence/tizen'
Change-Id: I0c26265961a3281681e0f22f47e5a8961df34ff4
WonYoung Choi [Thu, 10 Aug 2017 00:53:51 +0000 (09:53 +0900)]
Merge remote-tracking branch 'fido-client/tizen'
Change-Id: I18cb28aea24b1e25a4a2aac2b5a23ec532279ade
WonYoung Choi [Thu, 10 Aug 2017 00:53:14 +0000 (09:53 +0900)]
Merge remote-tracking branch 'feedback/tizen'
Change-Id: Iddc672d6f4b58320ddc64c1fb0cf2ca9e65c40ca
WonYoung Choi [Thu, 10 Aug 2017 00:50:38 +0000 (09:50 +0900)]
Merge remote-tracking branch 'elm-sharp/tizen'
Change-Id: Ide9bea0b79f4bed208b90459777463a4e72ffb54
WonYoung Choi [Thu, 10 Aug 2017 00:50:17 +0000 (09:50 +0900)]
Merge remote-tracking branch 'download/tizen'
Change-Id: Ie79f59fbe11cebb7ba5c7b42413d0975d4345fc5
WonYoung Choi [Thu, 10 Aug 2017 00:50:01 +0000 (09:50 +0900)]
Merge remote-tracking branch 'data-control/tizen'
Change-Id: I78d789c1beb9e690c9add0283f99152a7f2f499f
WonYoung Choi [Thu, 10 Aug 2017 00:49:45 +0000 (09:49 +0900)]
Merge remote-tracking branch 'd2d-conv-manager/tizen'
Change-Id: Ib45e4134fe0e1f881d2e21b5b36266969aa30021
WonYoung Choi [Thu, 10 Aug 2017 00:49:30 +0000 (09:49 +0900)]
Merge remote-tracking branch 'context/tizen'
Change-Id: Ia86212616da27f2e3570d7da2884d8c6cee13130
WonYoung Choi [Thu, 10 Aug 2017 00:49:15 +0000 (09:49 +0900)]
Merge remote-tracking branch 'contacts-service/tizen'
Change-Id: I5a0172ad4d52420acecd09d37b59bda7b9d0c17b
WonYoung Choi [Thu, 10 Aug 2017 00:49:00 +0000 (09:49 +0900)]
Merge remote-tracking branch 'connection/tizen'
Change-Id: I6075d937afe2015f5234c373c26e68e9ddbe213a
WonYoung Choi [Thu, 10 Aug 2017 00:48:44 +0000 (09:48 +0900)]
Merge remote-tracking branch 'calendar-service/tizen'
Change-Id: If71e9818a8fc9e1ca292ad03922841f89fad8ba3
WonYoung Choi [Thu, 10 Aug 2017 00:48:31 +0000 (09:48 +0900)]
Merge remote-tracking branch 'bluetooth/tizen'
Change-Id: Id3656145025fb53248979076a462a5ad64fbdbd4
WonYoung Choi [Thu, 10 Aug 2017 00:48:19 +0000 (09:48 +0900)]
Merge remote-tracking branch 'badge/tizen'
Change-Id: I95342158cb8fc9d8d3d6754ddb46f351f12bbeae
WonYoung Choi [Thu, 10 Aug 2017 00:48:07 +0000 (09:48 +0900)]
Merge remote-tracking branch 'attach-panel/tizen'
Change-Id: I9ac7f2cb96c7ac08eef1cb02da1ac8a44d783f09
WonYoung Choi [Thu, 10 Aug 2017 00:46:21 +0000 (09:46 +0900)]
Merge remote-tracking branch 'application/tizen'
Change-Id: Ic22cec53c76d1c5584aaa8a5022e42c66f964d5c
WonYoung Choi [Thu, 10 Aug 2017 00:46:19 +0000 (09:46 +0900)]
Merge remote-tracking branch 'account/tizen'
Change-Id: I8a792c4294c433e0e26a9b115f1d8b20c4e5133d
Tizen Infrastructure [Thu, 10 Aug 2017 00:27:02 +0000 (00:27 +0000)]
Initial empty repository
dongsug.song [Wed, 9 Aug 2017 15:08:02 +0000 (00:08 +0900)]
[Tizen] fix TextLabel's LineWrapMode
Change-Id: I75ac56c22824972e940737d585d54c8a2624b7cd
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
minho.sun [Wed, 9 Aug 2017 11:53:55 +0000 (20:53 +0900)]
[Tizen] Fix TCT failure
Change-Id: Ic72b626bf7cd06e8c9ac99318417ae9c6ed340e7
Signed-off-by: minho.sun <minho.sun@samsung.com>
Editor Lionbridge [Wed, 9 Aug 2017 10:10:37 +0000 (15:40 +0530)]
PS3: Edited files as per comments
Change-Id: Iaa20ba6c6248a68b8d8c9e4becda666eb5490b43
minho.sun [Wed, 9 Aug 2017 02:30:21 +0000 (11:30 +0900)]
[Tizen] Fix TCT Not Excuted.
Change-Id: I51e90c252be1e0796f8269720c91df28db920ca8
Signed-off-by: minho.sun <minho.sun@samsung.com>
kj7.sung [Wed, 9 Aug 2017 03:05:48 +0000 (12:05 +0900)]
version update
Change-Id: I0391b406c46e3efdf666f526fefacc371fa96f95
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
coderhyme [Wed, 9 Aug 2017 02:45:00 +0000 (02:45 +0000)]
Merge "[Player] Remove false descriptions in PlayerDisplaySettings." into tizen
coderhyme [Tue, 8 Aug 2017 11:34:37 +0000 (20:34 +0900)]
[Player] Remove false descriptions in PlayerDisplaySettings.
Change-Id: I5a6539e7049c3fe7fcf9e147851cf12fcb4a331c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
coderhyme [Tue, 8 Aug 2017 22:33:12 +0000 (07:33 +0900)]
Corrected wrong documentation tag.
Method should have returns tag, not value tag.
Change-Id: Ic898905fa593e3f23a54156774f8338b61e5c4fe
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Haesu Gwon [Wed, 14 Jun 2017 12:18:07 +0000 (21:18 +0900)]
[Camera][TCSACR-63] Add new API and change class names
Change some class names.
Add New API - InterruptStarted eventHandler and args.
Change Width, Height property to Size class in StillImage, PreviewFrame.
Change DisableShutterSound property to method.
Some properties are changed private, static.
Change-Id: I7444ddf3e5d437eb987ed0324c3ca32ca1e44f15
Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>
Editor Lionbridge [Tue, 8 Aug 2017 12:24:23 +0000 (17:54 +0530)]
Review bluetooth API cs files
Change-Id: I828186f0584ee94e1d22256b209ba589760728ad
sooyeon.kim [Tue, 8 Aug 2017 08:21:23 +0000 (17:21 +0900)]
Add version info in csproj
Change-Id: Ie72689cea7a3950c53724bacc1a401c5cfc96601
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
sooyeon.kim [Tue, 8 Aug 2017 08:18:04 +0000 (17:18 +0900)]
Add version info in csproj
Change-Id: I42d300ebb14c6965a199af1542adec1765e890e4
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
Hyunjin [Tue, 8 Aug 2017 02:42:29 +0000 (02:42 +0000)]
Merge "add Panel/Pane/Polygon/Popup/Naviframe/Performance TC" into tizen
jomui [Tue, 8 Aug 2017 01:06:53 +0000 (10:06 +0900)]
modify description
Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I3aaec0c335e181afb2eb490b0d5d098cee1154fd
Shinhui Kang [Mon, 7 Aug 2017 21:26:06 +0000 (21:26 +0000)]
Merge "[Tapitest] Added just implementation of few more APIs in Sim." into tizen
SungHyun Min [Mon, 7 Aug 2017 06:28:02 +0000 (15:28 +0900)]
Fix GestureLayer to inherit Widget instead of EvasObject
- to fix parent class of GestureLayer according to EFL spec
- for enabling/disabling GestureLayer
Change-Id: I57b27b97931110d3223f6cbd3dc17b7f48368fd2
Hyunjin [Wed, 2 Aug 2017 07:21:25 +0000 (16:21 +0900)]
add Panel/Pane/Polygon/Popup/Naviframe/Performance TC
Change-Id: I20604a2f18e8b61eeadac924d38cea1c73227983
kj7.sung [Mon, 7 Aug 2017 05:20:59 +0000 (14:20 +0900)]
Remove invalid exception
Change-Id: Id39e09b5a1d9ab4ed32fcb914f4d3a95f4608b7c
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
Editor Lionbridge [Wed, 26 Jul 2017 06:57:50 +0000 (12:27 +0530)]
Review Push API cs files
PS2: Restored unchanged files.
PS3: Remove \r
PS4: Rebase
Change-Id: Id46994695795fee5108ec0560b2e876d699974e2
Kangho Hur [Sun, 6 Aug 2017 22:50:12 +0000 (22:50 +0000)]
Merge "Add Tooltip's TC for checking basic operation of Tooltip" into tizen
minho.sun [Fri, 4 Aug 2017 10:32:21 +0000 (19:32 +0900)]
[Tizen] Fix build error
Change-Id: I783cf4b0fe8262f1b9157faeb59b5452f9624a04
Signed-off-by: minho.sun <minho.sun@samsung.com>
adhavan.m [Fri, 4 Aug 2017 08:52:10 +0000 (14:22 +0530)]
[Tapitest] Added just implementation of few more APIs in Sim.
Signed-off-by: adhavan.m <adhavan.m@samsung.com>
Change-Id: I9002ace1670b318e036d6a5cf5398ba1e6ed87e9
minho.sun [Fri, 4 Aug 2017 07:23:33 +0000 (07:23 +0000)]
Merge "[Tizen] Fix Window Set/Get Size/Position" into tizen
Minho Sun [Fri, 4 Aug 2017 07:03:31 +0000 (07:03 +0000)]
Merge "[Tizen] Add obsolete attribute for Create property of VisualBase, backward compatibility" into tizen
projects / platform / core / csapi / tizenfx.git / log