kervala
|
cb878500ad
|
Fixed: Ryzom Installer executable under OS X
--HG--
branch : develop
|
2016-10-17 11:12:06 +02:00 |
|
kervala
|
702516171d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-16 17:39:37 +02:00 |
|
kervala
|
c8891166ff
|
Changed: Disable FXAA checkbox if bloom not supported
--HG--
branch : develop
|
2016-10-16 17:39:07 +02:00 |
|
kervala
|
8e1123b9fb
|
Changed: Upgrade scripts
--HG--
branch : develop
|
2016-10-16 17:38:37 +02:00 |
|
kervala
|
bf39b96792
|
Fixed: Compilation
--HG--
branch : develop
|
2016-10-16 17:38:00 +02:00 |
|
kervala
|
142a06f40d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-16 17:31:37 +02:00 |
|
kervala
|
b78444490c
|
Fixed: Infinite loop when HTTP error occurs
--HG--
branch : develop
|
2016-10-16 17:29:10 +02:00 |
|
kervala
|
a5a488da3e
|
Changed: Always launch the more recent version of Installer
--HG--
branch : develop
|
2016-10-16 17:28:17 +02:00 |
|
kervala
|
f65883296b
|
Changed: Use getInstallerInstalledFilePath() to get installed Installer full path
--HG--
branch : develop
|
2016-10-16 17:26:05 +02:00 |
|
kervala
|
34734e4fbe
|
Fixed: Display all executables under OS X and Linux
--HG--
branch : develop
|
2016-10-16 17:22:51 +02:00 |
|
kervala
|
35b79a347b
|
Changed: Updated translations
--HG--
branch : develop
|
2016-10-16 17:20:02 +02:00 |
|
kervala
|
cfe14a5bcd
|
Changed: Better profiles editor under OS X
--HG--
branch : develop
|
2016-10-16 17:19:51 +02:00 |
|
kervala
|
f525deb1e2
|
Changed: Executable flags
--HG--
branch : compatibility-develop
|
2016-10-16 14:49:29 +02:00 |
|
Guillaume Dupuy
|
a79c371598
|
Fix end of function comment
--HG--
branch : fix_speed
|
2016-10-15 20:15:22 +02:00 |
|
Guillaume Dupuy
|
14966eef4c
|
Remove debug message
--HG--
branch : fix_speed
|
2016-10-15 20:14:26 +02:00 |
|
Guillaume Dupuy
|
02316b9e8d
|
Use double instead of float to allow big values of GameCycle (like on winchgate server)
--HG--
branch : fix_speed
|
2016-10-15 20:12:41 +02:00 |
|
Guillaume Dupuy
|
2818e9339d
|
Uses float to calculate latency for sabrina phrases
--HG--
branch : fix_speed
|
2016-10-15 19:04:22 +02:00 |
|
kervala
|
c3c377e4a6
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-15 17:16:34 +02:00 |
|
kervala
|
999fd9d3aa
|
Changed: Install shorcuts in Applications instead of /Applications
--HG--
branch : develop
|
2016-10-15 17:13:51 +02:00 |
|
kervala
|
43736cf523
|
Fixed: Wrong filename (because unallocated)
--HG--
branch : develop
|
2016-10-15 17:12:51 +02:00 |
|
kervala
|
f14a220e8e
|
Changed: Use flat frames (better under Windows XP)
--HG--
branch : develop
|
2016-10-15 17:12:20 +02:00 |
|
kervala
|
85c2535a1f
|
Fixed: Deadlock while calling CoUninitialize()
--HG--
branch : develop
|
2016-10-15 17:11:53 +02:00 |
|
kervala
|
fe9def78f0
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-15 10:37:56 +02:00 |
|
kervala
|
0f8a397408
|
Changed: Qt depends too on xcb-glx
--HG--
branch : develop
|
2016-10-15 10:37:29 +02:00 |
|
kervala
|
7a0a35586a
|
Changed: Copy Ryzom Installer in parent directory if present
--HG--
branch : develop
|
2016-10-15 10:27:34 +02:00 |
|
kervala
|
a70b4d2613
|
Fixed: Also copy DLLs compatible with Ryzom Installer
--HG--
branch : develop
|
2016-10-15 10:22:50 +02:00 |
|
Guillaume Dupuy
|
9c5ecea867
|
Use speed as an int instead of float to calculate latency
--HG--
branch : fix_speed
|
2016-10-14 21:19:27 +02:00 |
|
Guillaume Dupuy
|
0e467cba86
|
Make multiples states changes in one tick (if relevant)
--HG--
branch : fix_speed
|
2016-10-14 21:03:31 +02:00 |
|
Guillaume Dupuy
|
1d960d91ff
|
Fixed a rare case where float and double mixup would result in an incorrect speed
--HG--
branch : fix_speed
|
2016-10-13 20:46:10 +02:00 |
|
kervala
|
8324628ad4
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-13 19:51:38 +02:00 |
|
kervala
|
016e075fa5
|
Changed: Only install same client arch as Installer under Linux
--HG--
branch : develop
|
2016-10-13 19:50:11 +02:00 |
|
kervala
|
c3c4e56e4f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-12 15:12:52 +02:00 |
|
kervala
|
4d6842495d
|
Changed: Use a 128x128 icon for Linux
--HG--
branch : develop
|
2016-10-12 15:12:26 +02:00 |
|
kervala
|
a8d741882b
|
Changed: Also set executable flag for ryzom_installer_qt
--HG--
branch : develop
|
2016-10-12 15:12:09 +02:00 |
|
kervala
|
2c84f4b178
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-11 20:28:25 +02:00 |
|
kervala
|
01fd44cdc2
|
Changed: Don't need to install PNG, it'll be created
--HG--
branch : develop
|
2016-10-11 20:27:55 +02:00 |
|
kervala
|
55d357e555
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-11 18:43:07 +02:00 |
|
kervala
|
ed7586656b
|
Fixed: Wrong check for OS X
--HG--
branch : develop
|
2016-10-11 18:42:39 +02:00 |
|
kervala
|
2c757adbaa
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-11 18:04:35 +02:00 |
|
kervala
|
9744b44b6e
|
Changed: Specify server to use (the one of default profile)
--HG--
branch : develop
|
2016-10-11 18:04:01 +02:00 |
|
kervala
|
cc8a200156
|
Changed: Better error message
--HG--
branch : develop
|
2016-10-11 18:03:26 +02:00 |
|
kervala
|
bc45604e46
|
Changed: Only return if downloading data
--HG--
branch : develop
|
2016-10-11 18:02:55 +02:00 |
|
kervala
|
d2edc7d418
|
Changed: Remove unused code
--HG--
branch : develop
|
2016-10-11 18:02:34 +02:00 |
|
kervala
|
0087f4aec9
|
Changed: Abort if operation failed
--HG--
branch : develop
|
2016-10-11 18:02:20 +02:00 |
|
kervala
|
27550081da
|
Changed: Put real identifier for Ryzom Installer under OS X
--HG--
branch : develop
|
2016-10-11 17:46:05 +02:00 |
|
kervala
|
fdf69c006d
|
Changed: Remove useless information in Info.plist
--HG--
branch : develop
|
2016-10-11 17:45:39 +02:00 |
|
kervala
|
2460943bea
|
Fixed: Check if profiles are correct before using them
--HG--
branch : develop
|
2016-10-11 17:43:53 +02:00 |
|
kervala
|
f8155c116d
|
Changed: Little optimization
--HG--
branch : develop
|
2016-10-11 17:43:03 +02:00 |
|
kervala
|
44ddae76b8
|
Changed: Escape strings that will be in XML file
--HG--
branch : develop
|
2016-10-11 17:42:46 +02:00 |
|
kervala
|
f0d591bca7
|
Changed: Remove nameToId
--HG--
branch : develop
|
2016-10-11 17:41:49 +02:00 |
|
kervala
|
a1fab80cad
|
Changed: Added more comments
--HG--
branch : develop
|
2016-10-11 17:28:54 +02:00 |
|
kervala
|
1f95d69a81
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-10 20:47:56 +02:00 |
|
kervala
|
977241a37a
|
Changed: Use same name for executable than bundle
--HG--
branch : develop
|
2016-10-10 20:47:33 +02:00 |
|
kervala
|
efdbedce3e
|
Changed: Disable architecture choice under OS X (always 64 bits)
--HG--
branch : develop
|
2016-10-10 20:47:15 +02:00 |
|
kervala
|
40fdaa50fa
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-10 20:03:13 +02:00 |
|
kervala
|
4ed4c14971
|
Changed: Create a bundle for Ryzom Installer under OS X
--HG--
branch : develop
|
2016-10-10 20:02:38 +02:00 |
|
kervala
|
3ab030e359
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-10 18:55:28 +02:00 |
|
kervala
|
73fd215b21
|
Fixed: Use exec instead of open to launch an executable under OS X
--HG--
branch : develop
|
2016-10-10 18:54:03 +02:00 |
|
kervala
|
9a402ea68c
|
Fixed: Create directory before trying to create a client.cfg
--HG--
branch : develop
|
2016-10-10 18:53:39 +02:00 |
|
kervala
|
acdbbd63b3
|
Changed: Fix english comment
--HG--
branch : develop
|
2016-10-10 18:53:11 +02:00 |
|
kervala
|
41d0e70064
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-10 16:36:38 +02:00 |
|
kervala
|
f279e5f726
|
Fixed: Missing .sh file in QRC
--HG--
branch : develop
|
2016-10-10 16:35:45 +02:00 |
|
kervala
|
5e0338d622
|
Fixed: Wrong modification dates of files uncompressed from 7z and ZIP archives
--HG--
branch : develop
|
2016-10-10 16:35:29 +02:00 |
|
kervala
|
aefaa8f098
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-09 19:53:31 +02:00 |
|
kervala
|
7b6a6945e5
|
Changed: Error 6 occurs when a 7z file is damaged and can't be uncompressed
--HG--
branch : develop
|
2016-10-09 19:50:35 +02:00 |
|
kervala
|
8caac6363f
|
Changed: Support special bundle structure for OS X client
--HG--
branch : develop
|
2016-10-09 19:50:06 +02:00 |
|
kervala
|
a32878ab06
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-09 15:34:28 +02:00 |
|
kervala
|
1a3a0911e3
|
Changed: Write icon under Linux if not found
--HG--
branch : develop
|
2016-10-09 15:10:15 +02:00 |
|
kervala
|
cd618d4402
|
Changed: Remove whole directory if empty
--HG--
branch : develop
|
2016-10-09 15:09:54 +02:00 |
|
kervala
|
533e01ea5a
|
Changed: Created and used isDirectoryWritable() function
--HG--
branch : develop
|
2016-10-09 15:09:30 +02:00 |
|
kervala
|
16ee68d3d3
|
Changed: Write shortcuts under OS X
--HG--
branch : develop
|
2016-10-09 15:08:37 +02:00 |
|
kervala
|
360907c48d
|
Changed: Better quality icon for Linux
--HG--
branch : develop
|
2016-10-09 14:51:18 +02:00 |
|
kervala
|
e366d8cb9b
|
Changed: Renamed ryzom_installer.png to ryzom.png
--HG--
branch : develop
|
2016-10-09 14:50:51 +02:00 |
|
kervala
|
a484a4aa53
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-08 18:29:31 +02:00 |
|
kervala
|
d3bf97e00f
|
Fixed: NL_OS_WIN32 is never defined
--HG--
branch : develop
|
2016-10-08 18:28:54 +02:00 |
|
kervala
|
7559190c29
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-08 14:15:15 +02:00 |
|
kervala
|
263665696a
|
Changed: Don't propose to migrate in CInstallDialog
--HG--
branch : develop
|
2016-10-08 14:14:37 +02:00 |
|
kervala
|
0eeae6c652
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-04 19:27:56 +02:00 |
|
kervala
|
c348bbb3de
|
Changed: Delete old profiles shortcuts (in case where they are renamed)
--HG--
branch : develop
|
2016-10-04 19:27:29 +02:00 |
|
kervala
|
e4d156be08
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-04 12:04:23 +02:00 |
|
kervala
|
d1575b9f58
|
Fixed: Don't check if directory is empty when reinstalling in same directory
--HG--
branch : develop
|
2016-10-04 11:58:51 +02:00 |
|
kervala
|
67cc549fe6
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-03 17:22:46 +02:00 |
|
kervala
|
fc6415d64b
|
Fixed: Wrong signals
--HG--
branch : develop
|
2016-10-03 17:20:43 +02:00 |
|
kervala
|
3df8c75227
|
Changed: Call updateAddRemoveEntry() instead of setting details twice
--HG--
branch : develop
|
2016-10-03 17:20:25 +02:00 |
|
kervala
|
0cab55f3f9
|
Changed: Update product comments
--HG--
branch : develop
|
2016-10-03 17:19:53 +02:00 |
|
kervala
|
53854c88ae
|
Fixed: EstimatedSize is in KiB
--HG--
branch : develop
|
2016-10-03 17:19:41 +02:00 |
|
kervala
|
2377b6a45d
|
Changed: Minor changes
--HG--
branch : develop
|
2016-10-03 17:18:48 +02:00 |
|
kervala
|
983f4f81df
|
Fixed: Create Menu directory before creating shortcuts
--HG--
branch : develop
|
2016-10-03 17:18:25 +02:00 |
|
kervala
|
72144c3131
|
Fixed: Wrong size for downloaded components
--HG--
branch : develop
|
2016-10-03 17:17:57 +02:00 |
|
kervala
|
7d7ce29894
|
Changed: Installer filename should not depend on server
--HG--
branch : develop
|
2016-10-03 17:17:20 +02:00 |
|
kervala
|
9c1a5a315f
|
Changed: Include Installer icon in QRC
--HG--
branch : develop
|
2016-10-03 17:14:43 +02:00 |
|
kervala
|
20f0092e63
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-03 10:02:06 +02:00 |
|
kervala
|
ca9ccf5fbf
|
Changed: Variables to debug infinite loops
--HG--
branch : develop
|
2016-10-03 10:01:30 +02:00 |
|
kervala
|
c0d4013b51
|
Changed: New functions to remove a shortcut and check if it exists
--HG--
branch : develop
|
2016-10-03 09:59:19 +02:00 |
|
kervala
|
9d9838a837
|
Changed: Updated translations
--HG--
branch : develop
|
2016-10-03 09:55:59 +02:00 |
|
kervala
|
fd3b681203
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-01 18:43:48 +02:00 |
|
kervala
|
f4f8ec29d3
|
Changed: Implement AlphaLuminance resample
--HG--
branch : develop
|
2016-10-01 18:43:08 +02:00 |
|
kervala
|
d68dbdef7a
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-01 14:11:10 +02:00 |
|
kervala
|
96378bb0b6
|
Fixed: Compilation under OS X
--HG--
branch : develop
|
2016-10-01 14:10:43 +02:00 |
|
kervala
|
c5881e9f11
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-10-01 13:10:05 +02:00 |
|
kervala
|
17052235b5
|
Changed: Updated translations
--HG--
branch : develop
|
2016-10-01 13:09:19 +02:00 |
|
kervala
|
89be376c1f
|
Fixed: Use real data size when migrating
--HG--
branch : develop
|
2016-10-01 13:07:18 +02:00 |
|
kervala
|
1ebc739797
|
Fixed: msvcr140.dll is called vcrunrime140.dll
--HG--
branch : develop
|
2016-10-01 13:05:58 +02:00 |
|
kervala
|
f17f7954ac
|
Fixed: Unable to find a shortcut
--HG--
branch : develop
|
2016-10-01 13:05:11 +02:00 |
|
kervala
|
320f3e6c46
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-29 20:47:46 +02:00 |
|
kervala
|
f39e135494
|
Fixed: Delete ryzom_installer.ini when uninstalling Installer
--HG--
branch : develop
|
2016-09-29 20:47:03 +02:00 |
|
kervala
|
b6a88ad754
|
Fixed: Create Installer link under Linux
--HG--
branch : develop
|
2016-09-29 20:46:29 +02:00 |
|
kervala
|
45c9b402ad
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-29 17:08:03 +02:00 |
|
kervala
|
76d05750f4
|
Changed: Don't update Qt translations
--HG--
branch : develop
|
2016-09-29 17:07:28 +02:00 |
|
kervala
|
a5e964351d
|
Changed: Updated translations
--HG--
branch : develop
|
2016-09-29 17:06:38 +02:00 |
|
kervala
|
7e32d9b928
|
Changed: New checks after selecting a directory (must be empty and write permissions)
--HG--
branch : develop
|
2016-09-29 17:05:20 +02:00 |
|
kervala
|
13aac03c04
|
Changed: Use default directory when choosing destination
--HG--
branch : develop
|
2016-09-29 17:03:59 +02:00 |
|
kervala
|
a9891214bd
|
Changed: Disable texts that don't need to be translated
--HG--
branch : develop
|
2016-09-29 17:03:17 +02:00 |
|
kervala
|
f5035aa63d
|
Changed: New button for default location
--HG--
branch : develop
|
2016-09-29 16:54:50 +02:00 |
|
kervala
|
136325930a
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-29 00:20:47 +02:00 |
|
kervala
|
75faa59be4
|
Changed: Updated translations
--HG--
branch : develop
|
2016-09-29 00:20:25 +02:00 |
|
kervala
|
ac9dcd663d
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-28 23:55:21 +02:00 |
|
kervala
|
bf96615bc4
|
Changed: Minor changes
--HG--
branch : develop
|
2016-09-28 23:42:33 +02:00 |
|
kervala
|
e7b23c958a
|
Fixed: Connexion -> Connection typo
--HG--
branch : develop
|
2016-09-28 23:42:01 +02:00 |
|
kervala
|
9c4225d74e
|
Fixed: Desktop files need to be executable
--HG--
branch : develop
|
2016-09-28 23:32:24 +02:00 |
|
kervala
|
9af4edf07a
|
Changed: Increase timeout delay to 30s (just to avoid to wait forever)
--HG--
branch : develop
|
2016-09-28 23:31:26 +02:00 |
|
kervala
|
f168dd17e2
|
Changed: Also check icon in same directory as executable
--HG--
branch : develop
|
2016-09-28 23:30:24 +02:00 |
|
kervala
|
9557aff2cc
|
Fixed: Remove all directories from data excepted fonts one
--HG--
branch : develop
|
2016-09-28 23:29:02 +02:00 |
|
kervala
|
5d4bdf8f60
|
Fixed: Don't fix height of operation dialog
--HG--
branch : develop
|
2016-09-28 23:27:15 +02:00 |
|
kervala
|
73bce1e259
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-28 12:25:45 +02:00 |
|
kervala
|
9534b01d87
|
Changed: Updated translations
--HG--
branch : develop
|
2016-09-28 12:23:25 +02:00 |
|
kervala
|
ad11871e7a
|
Changed: Simplify progress texts
--HG--
branch : develop
|
2016-09-28 12:22:27 +02:00 |
|
kervala
|
e812b2ed6e
|
Changed: Updated translations
--HG--
branch : compatibility-develop
|
2016-09-27 14:57:12 +02:00 |
|
kervala
|
0b0171b723
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-26 10:41:52 +02:00 |
|
kervala
|
c1d48c995a
|
Changed: Updated translations
--HG--
branch : develop
|
2016-09-26 10:40:56 +02:00 |
|
kervala
|
032e46b97a
|
Added: Ryzhome files
--HG--
branch : compatibility-develop
|
2016-09-25 14:21:42 +02:00 |
|
kervala
|
2fc39bc14d
|
Added: Missing files from data_common.bnp
--HG--
branch : compatibility-develop
|
2016-09-25 14:17:30 +02:00 |
|
kervala
|
881e5457ac
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-25 10:50:38 +02:00 |
|
kervala
|
07ddb63d61
|
Changed: Add a new line after description
--HG--
branch : develop
|
2016-09-25 10:50:13 +02:00 |
|
kervala
|
a41ae065d8
|
Changed: Remove alternative formats for parameters (too verbose)
--HG--
branch : develop
|
2016-09-25 10:49:55 +02:00 |
|
kervala
|
abdb7fca21
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-25 10:37:42 +02:00 |
|
kervala
|
4b4b321169
|
Changed: Allow to compile Ryzom tools even without MySQL (mysql client library has compilation problems with VC++ 2015)
--HG--
branch : develop
|
2016-09-25 10:24:51 +02:00 |
|
kervala
|
72ed8b2c61
|
Changed: Client directory already processed
--HG--
branch : develop
|
2016-09-25 10:23:57 +02:00 |
|
kervala
|
e6fa251d92
|
Changed: Moved init code in sheets_packer.cpp
Changed: Expand environment variables for other variables too
Changed: Don't create log.log
Changed: Added missing AGPL headers
--HG--
branch : develop
|
2016-09-25 10:23:34 +02:00 |
|
kervala
|
33dfd39409
|
Changed: Use CCmdArgs for sheets_packer, see #281
--HG--
branch : develop
|
2016-09-25 10:20:49 +02:00 |
|
kervala
|
dcf90f381f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-24 15:54:47 +02:00 |
|
kervala
|
130b270380
|
Fixed: tga2dds doesn't generate mipmaps
--HG--
branch : develop
|
2016-09-24 15:54:28 +02:00 |
|
kervala
|
b1f28ace36
|
Changed: Updated German translations
--HG--
branch : develop
|
2016-09-24 15:53:58 +02:00 |
|
kervala
|
ce576954e0
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-09-24 14:22:22 +02:00 |
|
kervala
|
ec5deea3f0
|
Changed: Generate an exception if file is not a supported bitmap format
--HG--
branch : develop
|
2016-09-24 14:19:35 +02:00 |
|
kervala
|
af1f02c53f
|
Changed: Download from "installer" directory now, see #279
--HG--
branch : develop
|
2016-09-24 14:18:44 +02:00 |
|
kervala
|
162e683803
|
Changed: New methods loadFromSettings and saveToSettings for CProfile and CServer, see #279
--HG--
branch : develop
|
2016-09-24 14:17:43 +02:00 |
|
kervala
|
1ce480a809
|
Changed: Minor change
--HG--
branch : develop
|
2016-09-24 14:00:01 +02:00 |
|
kervala
|
3c4f5bfd4c
|
Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp
--HG--
branch : develop
|
2016-09-24 13:59:09 +02:00 |
|
kervala
|
67f1797f6d
|
Changed: Updated German translations
--HG--
branch : develop
|
2016-09-24 13:26:45 +02:00 |
|