Commit Graph

5117 Commits

Author SHA1 Message Date
c3b7833e72 libimg: Avoid SSE pinsrw instruction in blend_mmx.asm
pinsrw can act on MMX registers, but it is still an SSE instruction.

git-svn-id: svn://kolibrios.org@9273 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-15 21:20:52 +00:00
Kirill Lipatov (Leency)
7288de6237 Eolite: fixed two bugs (thanks kw33 for found one)
git-svn-id: svn://kolibrios.org@9269 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-14 23:16:56 +00:00
Doczom
0aff050c49 fix count type
git-svn-id: svn://kolibrios.org@9267 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-14 15:23:19 +00:00
Doczom
aca4e09228 fixed content type definitions
git-svn-id: svn://kolibrios.org@9266 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-14 14:16:03 +00:00
Kirill Lipatov (Leency)
2b790ca52d WebView 3.52: handle dd, dl unclosed tags (thanks turbocat2001 for the bug report)
git-svn-id: svn://kolibrios.org@9263 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-13 17:21:44 +00:00
turbocat
9257d2c34c libc.obj:
- Added basename() and  dirname()
 - libc_test all tabs -> spaces

git-svn-id: svn://kolibrios.org@9262 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-12 22:45:22 +00:00
Kirill Lipatov (Leency)
1b84dbe19e mousecfg: use a hotkey to turn on mouse emulation
git-svn-id: svn://kolibrios.org@9261 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-08 23:46:33 +00:00
turbocat
f0928164bd libc.obj: fixed asctime() format and UTC mktime() bug.
git-svn-id: svn://kolibrios.org@9260 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-07 19:29:12 +00:00
Kirill Lipatov (Leency)
2eddf0b1c0 WebView: fix page scroll when user is just clicked on a scrolling area and did not drug a slider
git-svn-id: svn://kolibrios.org@9259 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-05 18:03:23 +00:00
turbocat
cf33391052 ktcc: Delete old tinygl library
git-svn-id: svn://kolibrios.org@9247 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-04 20:25:19 +00:00
Kirill Lipatov (Leency)
7015aadd71 System Panel:
- add Network Speed test (thanks Coldy for the idea)
- add AMDtemp, also add app icon into icons32.png

git-svn-id: svn://kolibrios.org@9246 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-03 22:53:03 +00:00
turbocat
9ca128acbd Added libc_test.c for testing libc.obj (by "navichok26")
git-svn-id: svn://kolibrios.org@9242 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-03 18:52:54 +00:00
Kirill Lipatov (Leency)
251d03d5f0 Upload optimized Phoenix and ASCL by Kolibrius
git-svn-id: svn://kolibrios.org@9241 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-03 18:23:06 +00:00
Kirill Lipatov (Leency)
b654a4e928 View3DS by macgub: bugfixes and new rendering model - ray casted shadows. Check Readme for more info.
git-svn-id: svn://kolibrios.org@9237 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-03 16:39:08 +00:00
turbocat
ed57c702d1 tinybasic-1.0.4 fixed Tupefile.lua
git-svn-id: svn://kolibrios.org@9235 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-02 22:31:12 +00:00
turbocat
27ece40648 TinyBasic-1.0.4 added to autobuild
git-svn-id: svn://kolibrios.org@9234 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-02 22:27:40 +00:00
turbocat
82ddf447d5 libc.obj: Fixed div, ldiv, lldiv ( problem with the compatibility of returned structures in functions between tcc and gcc) thanks to Boppan).
git-svn-id: svn://kolibrios.org@9233 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-02 21:29:04 +00:00
turbocat
bd8a5b6e8e libc.obj:
- added strtod();
 - added "+" to fopen mode; 

git-svn-id: svn://kolibrios.org@9230 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-01 14:46:28 +00:00
turbocat
5ab7151d7d ktcc : libcryptal fixed crash
git-svn-id: svn://kolibrios.org@9229 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-01 10:03:14 +00:00
hidnplayr
3aa9014b7b add very simple UDP server example
git-svn-id: svn://kolibrios.org@9228 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-11-01 07:19:05 +00:00
Magomed Kostoev (mkostoevr)
b5163461dc [clink] Make it compile by GCC
git-svn-id: svn://kolibrios.org@9220 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-10-17 09:33:01 +00:00
Magomed Kostoev (mkostoevr)
fa72a8449e [clink] Update README.txt
git-svn-id: svn://kolibrios.org@9218 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-10-16 22:04:42 +00:00
Doczom
0463411ffd rename amd_temp_view.asm in AMDtemp.asm
git-svn-id: svn://kolibrios.org@9217 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-10-16 08:06:45 +00:00
553742f877 libcrash: sync with upstream.
* Implement new algorithms:
  - MACs: Poly1305, HMAC (SHA2_256, SHA2_512),
  - ciphers: ChaCha20, AES256CTR, AES256CBC.
* Remove MD4 hash.
* Change API (it happens).
* Update crashtest example.


git-svn-id: svn://kolibrios.org@9216 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-10-15 00:52:46 +00:00
Anton Krotov
5410543f49 CEDIT: minor fixes, refactoring
git-svn-id: svn://kolibrios.org@9210 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-10-03 17:44:42 +00:00
hidnplayr
683ccfc78f Bugfix from 'Jurgen' for repne scasw / repnz stosw and handling of unknown/invalid opcodes.
See https://board.kolibrios.org/viewtopic.php?p=77209#p77209 for details.

git-svn-id: svn://kolibrios.org@9209 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-30 16:36:29 +00:00
Anton Krotov
c2885eb759 CEDIT: internal changes
git-svn-id: svn://kolibrios.org@9208 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-28 16:15:37 +00:00
turbocat
d38b3890d2 Added libshell for TCC
git-svn-id: svn://kolibrios.org@9207 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-26 19:56:07 +00:00
turbocat
7409019c5d Loaded libSDL.a, libsound.a and updated libc.obj.a for tcc.
git-svn-id: svn://kolibrios.org@9205 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-26 17:59:57 +00:00
turbocat
2076a4a777 libc.obj:
- Added vsprintf to export
 - Added sdltest.c example

git-svn-id: svn://kolibrios.org@9204 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-26 17:55:43 +00:00
Doczom
b9889434d8 fix height checkbox
git-svn-id: svn://kolibrios.org@9201 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-25 16:45:31 +00:00
Anton Krotov
95dfb31882 CEDIT: minor fixes
git-svn-id: svn://kolibrios.org@9200 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-24 18:04:52 +00:00
Doczom
a33723e2b3 add @notify message for input error load driver
git-svn-id: svn://kolibrios.org@9199 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-22 16:00:51 +00:00
Doczom
3dc5b3d654 fix BUTTON.WIDTH in cpu.asm
git-svn-id: svn://kolibrios.org@9198 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-22 14:50:17 +00:00
Anton Krotov
f3105b9785 cedit: search selected text
FB2 Reader: minor fix

git-svn-id: svn://kolibrios.org@9197 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-21 18:16:56 +00:00
7763a294f3 pcidev: fix output of the last bus #, increase window height
git-svn-id: svn://kolibrios.org@9196 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-20 10:20:43 +00:00
Anton Krotov
de0a25e478 CEDIT: bugfix
git-svn-id: svn://kolibrios.org@9194 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-16 22:27:49 +00:00
Anton Krotov
7524609331 CEDIT: optional highlighting of operators and delimiters
git-svn-id: svn://kolibrios.org@9193 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-15 21:40:33 +00:00
Anton Krotov
86da2194d2 CEDIT: menu changes
git-svn-id: svn://kolibrios.org@9190 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-14 16:33:15 +00:00
turbocat
4918685b4a libc.obj: Fixed calloc function
git-svn-id: svn://kolibrios.org@9189 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-13 19:02:24 +00:00
Anton Krotov
9c0be1dd39 CEDIT: Keyboard navigation in menu; internal changes
git-svn-id: svn://kolibrios.org@9187 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-11 20:57:43 +00:00
Anton Krotov
4c7867ece9 CEDIT: new checkboxes
git-svn-id: svn://kolibrios.org@9182 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-08 20:47:14 +00:00
Anton Krotov
3f871a7798 CEDIT: better timer, minor fixes
git-svn-id: svn://kolibrios.org@9181 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-07 20:18:42 +00:00
Anton Krotov
0d7861018a CEDIT: EOL conversion (CRLF/LF/CR)
git-svn-id: svn://kolibrios.org@9180 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-06 21:06:31 +00:00
turbocat
9d2e5a6e3a libc.obj:
- Extra zero for use with gcc

git-svn-id: svn://kolibrios.org@9179 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-06 20:24:26 +00:00
0c45d523d3 WebView: added build and run scripts for linux
git-svn-id: svn://kolibrios.org@9178 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-05 10:40:30 +00:00
Anton Krotov
ce8fecbc6b Oberon07: v1.53
git-svn-id: svn://kolibrios.org@9177 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-03 17:21:37 +00:00
Anton Krotov
e861f97224 CEDIT: rebuild
git-svn-id: svn://kolibrios.org@9176 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-03 16:47:48 +00:00
Anton Krotov
50936c312e CEDIT: some small changes
git-svn-id: svn://kolibrios.org@9175 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-03 16:20:40 +00:00
Anton Krotov
e85879654e CEDIT: new version
git-svn-id: svn://kolibrios.org@9174 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-02 23:15:33 +00:00
turbocat
1a5f178264 SHELL 0.8.3:
- Added the ability to create  parent directories if needed( "mkdir" command)

git-svn-id: svn://kolibrios.org@9173 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-09-02 21:20:12 +00:00
turbocat
d0336453fe console.obj :
- better mechanism for killing the parent process.


git-svn-id: svn://kolibrios.org@9167 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-29 19:36:10 +00:00
turbocat
109befa1e4 libc.obj:
- fixed fread bug  

git-svn-id: svn://kolibrios.org@9165 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-29 18:27:24 +00:00
hidnplayr
261bcf35ff FTPC: improved error handeling in wait_for_servercommand
git-svn-id: svn://kolibrios.org@9164 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-29 17:37:31 +00:00
Doczom
5736de5a6f fix bug in scroll
git-svn-id: svn://kolibrios.org@9163 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-28 23:50:09 +00:00
turbocat
785dcb3341 libc.obj:
- fixed return fwrite and fread as well as eof

git-svn-id: svn://kolibrios.org@9156 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-26 20:35:11 +00:00
turbocat
e5501138fe "thread_work" C example added to "build_all.sh"
git-svn-id: svn://kolibrios.org@9155 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-25 19:01:29 +00:00
turbocat
89808a957a ktcc:
- disabled for windows and linux build

git-svn-id: svn://kolibrios.org@9154 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-25 18:47:45 +00:00
turbocat
e08cff4a2a ktcc:
- added definitions of _KOLIBRI, _KOLIBRI, _KOLIBRI_  by default 
- added ktcc for Windows and Linux to autobuild

git-svn-id: svn://kolibrios.org@9153 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-25 18:30:26 +00:00
hidnplayr
2f33c5d0a4 AR81xx: Add PCI ID's of some more possibly working devices. (Disabled in netcfg for now)
git-svn-id: svn://kolibrios.org@9150 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-23 20:57:10 +00:00
hidnplayr
8822960988 AR81xx: Bugfixes (now also works on non-gigabit devices such as QCA8172), refactoring.
git-svn-id: svn://kolibrios.org@9146 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-22 20:18:00 +00:00
turbocat
e7ec006b8b libc.obj:
- Added atof function
- Added example for working with threads

git-svn-id: svn://kolibrios.org@9137 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-15 20:21:32 +00:00
hidnplayr
760d64a3cd CP866->UTF8 input recode
git-svn-id: svn://kolibrios.org@9132 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-11 20:59:10 +00:00
hidnplayr
86308adc77 Cosmetic fixes
git-svn-id: svn://kolibrios.org@9129 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-09 16:01:04 +00:00
hidnplayr
3524e7c3b1 Ctrl+C for ping, tracert.
git-svn-id: svn://kolibrios.org@9128 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-09 06:14:00 +00:00
hidnplayr
c565761174 Fix con_kbhit
git-svn-id: svn://kolibrios.org@9127 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-08 19:51:29 +00:00
hidnplayr
fa01917d38 Variable RSA key length
git-svn-id: svn://kolibrios.org@9126 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-08 14:03:26 +00:00
hidnplayr
73e2a25f84 Fix con_get_input, added some common control characters.
git-svn-id: svn://kolibrios.org@9125 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-08 13:58:04 +00:00
Doczom
ee74827e6e KFM: Add function create file
git-svn-id: svn://kolibrios.org@9121 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-05 19:52:42 +00:00
Doczom
0317b4b039 fix constants
git-svn-id: svn://kolibrios.org@9120 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-05 17:46:31 +00:00
Doczom
3bb43bd591 rename amd_temp_view on AMDtemp
git-svn-id: svn://kolibrios.org@9119 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-05 16:07:29 +00:00
Doczom
76ad1e5d09 add new constants
git-svn-id: svn://kolibrios.org@9118 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-05 12:08:28 +00:00
Doczom
9db77b5d37 small fix
git-svn-id: svn://kolibrios.org@9117 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 23:38:44 +00:00
Doczom
9d140d1abd fix title
git-svn-id: svn://kolibrios.org@9116 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 16:09:59 +00:00
Doczom
810f63c6af add autobuild
git-svn-id: svn://kolibrios.org@9115 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 15:59:41 +00:00
hidnplayr
9a1e9333b3 Add support for RSA host authentication with SHA2-512 algorithm.
git-svn-id: svn://kolibrios.org@9114 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 10:40:43 +00:00
hidnplayr
2b094111e9 Add support for RSA host authentication with SHA2-256 algorithm.
git-svn-id: svn://kolibrios.org@9113 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 10:12:48 +00:00
hidnplayr
33d98adcfa Implemented local storage and checking of remote host keys. (only ssh-rsa for now)
Known public keys will be stored in /sys/settings/known_hosts.ini

git-svn-id: svn://kolibrios.org@9112 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-04 08:41:16 +00:00
Doczom
9438fa3384 delete file
git-svn-id: svn://kolibrios.org@9111 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-03 21:28:12 +00:00
Doczom
be2f165d44 move amd_temp_view
git-svn-id: svn://kolibrios.org@9110 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-03 21:27:06 +00:00
Doczom
b9b4201bd5 delete file
git-svn-id: svn://kolibrios.org@9109 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-03 19:46:00 +00:00
Doczom
ad96df5dc3 Fix files
git-svn-id: svn://kolibrios.org@9108 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-03 19:37:08 +00:00
Doczom
99990eb490 add new program "amd_temp_view"
git-svn-id: svn://kolibrios.org@9107 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-03 19:19:36 +00:00
hidnplayr
67b03ef814 Big refactor: separate backend from frontend. Prepare for dynamically negotiated algorithms etc.
New: RSA host authentication, use new con_get_input from console.lib to get escape codes from special keys, UTF8 to CP866 decoder, ..
Bugfix: CTR counters.

git-svn-id: svn://kolibrios.org@9106 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-02 18:40:01 +00:00
hidnplayr
ec273ce904 More escape codes.
New function 'con_get_input' useful to get escape codes from special keys. 
Implemented alternative screen buffer.
See included documentation for more details.

git-svn-id: svn://kolibrios.org@9105 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-02 18:11:13 +00:00
Kirill Lipatov (Leency)
5c1c425d92 WebView: bugfix
git-svn-id: svn://kolibrios.org@9104 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-02 17:57:41 +00:00
Kirill Lipatov (Leency)
778de94be4 WebView 3.5: basic table support (all cols are same width, no colspan, no borders...)
git-svn-id: svn://kolibrios.org@9103 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-08-02 14:08:12 +00:00
hidnplayr
7f933eb487 Console: Bell character support, escape code '<esc>]K' (erase in line) support
git-svn-id: svn://kolibrios.org@9096 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-28 07:36:54 +00:00
turbocat
32a304e64b mtar.obj:
use now wrappers names

git-svn-id: svn://kolibrios.org@9095 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-27 00:25:11 +00:00
turbocat
52dd2872bf libc,obj:
- changed wrapper names

git-svn-id: svn://kolibrios.org@9094 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-27 00:20:54 +00:00
turbocat
e10c8c25cc libc.obj:
- restructured ksys.h

git-svn-id: svn://kolibrios.org@9093 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-26 23:42:35 +00:00
hidnplayr
ae553821c2 IRCc 0.34: Faster text drawing, add some server command codes related to WHOIS reply.
git-svn-id: svn://kolibrios.org@9092 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-26 16:18:14 +00:00
turbocat
a188a171dd mbedtls:
- strip replaced by kos32-strip

git-svn-id: svn://kolibrios.org@9091 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-26 14:03:11 +00:00
hidnplayr
ffdfe97ebd MPINT: Less fiddling with bits and bytes, more performance.
git-svn-id: svn://kolibrios.org@9090 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-26 09:44:08 +00:00
Kirill Lipatov (Leency)
1ab60232c8 WebView: various fixes
git-svn-id: svn://kolibrios.org@9089 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-26 07:21:58 +00:00
Magomed Kostoev (mkostoevr)
53e6a25eb8 [clink] Improve program argument system
git-svn-id: svn://kolibrios.org@9088 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-25 20:38:50 +00:00
turbocat
be0e7536fb mbedtls:
- fixed autobuild clink path

git-svn-id: svn://kolibrios.org@9087 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-25 19:57:05 +00:00
turbocat
b3059bf461 mbedtls:
- added to autobuild

git-svn-id: svn://kolibrios.org@9086 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-25 19:53:54 +00:00
Magomed Kostoev (mkostoevr)
451b859916 [clink] Small fixes for GCC (rev. cbd306345347fae28f12fa7f79960403d19e216e)
git-svn-id: svn://kolibrios.org@9085 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-25 19:14:27 +00:00
Magomed Kostoev (mkostoevr)
188a8f0370 [clink] Emit log on -v, -verbose or --verbose
git-svn-id: svn://kolibrios.org@9084 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-07-25 12:22:47 +00:00