Sergey Semyonov (Serge)
71ef7e28cd
acpi: define IRQ_PIC, IRQ_APIC
...
git-svn-id: svn://kolibrios.org@2219 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-21 13:58:48 +00:00
Sergey Semyonov (Serge)
e06410d094
merge acpi #2217
...
git-svn-id: svn://kolibrios.org@2218 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-21 09:13:47 +00:00
Sergey Semyonov (Serge)
9447e850cf
map_io_mem: set proper region size
...
git-svn-id: svn://kolibrios.org@2217 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-20 21:11:22 +00:00
Marat Zakiyanov (Mario79)
9e5b90e354
window.inc - fix for r.1474
...
git-svn-id: svn://kolibrios.org@2214 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-20 00:07:56 +00:00
Sergey Semyonov (Serge)
f95c868e2f
acpi: read ioapic & local apic bases
...
git-svn-id: svn://kolibrios.org@2212 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-19 18:35:05 +00:00
Sergey Semyonov (Serge)
6bbd71b6f8
acpi: merge trank
...
git-svn-id: svn://kolibrios.org@2209 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-18 20:51:00 +00:00
Marat Zakiyanov (Mario79)
4db1abbe76
I very much hope that this is the last fix for r.2129. This revision makes me cry.
...
git-svn-id: svn://kolibrios.org@2208 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-17 23:08:48 +00:00
Marat Zakiyanov (Mario79)
59fc4ab346
tcp.inc: fix for r2129
...
git-svn-id: svn://kolibrios.org@2186 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-14 16:21:32 +00:00
Marat Zakiyanov (Mario79)
213f39d0cd
CAPS LOCK for ASCII key
...
git-svn-id: svn://kolibrios.org@2171 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-11 17:31:15 +00:00
Sergey Semyonov (Serge)
be59696270
merge kolibri_acpi #2156
...
git-svn-id: svn://kolibrios.org@2167 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-10 10:58:39 +00:00
Sergey Semyonov (Serge)
6252cd9a99
rename IRQ_EOI(irq) -> __fastcall irq_eoi(irq)
...
git-svn-id: svn://kolibrios.org@2166 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-10 10:52:59 +00:00
Sergey Semyonov (Serge)
751664d089
heap: fix memory leakage
...
git-svn-id: svn://kolibrios.org@2164 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-07 21:27:52 +00:00
Sergey Semyonov (Serge)
20a4ca93e3
taskman:fix error reporting
...
git-svn-id: svn://kolibrios.org@2157 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-05 11:23:08 +00:00
Sergey Semyonov (Serge)
37118c3bc0
kernel_heap: hash table for memory descriptors
...
git-svn-id: svn://kolibrios.org@2156 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-05 09:36:30 +00:00
Sergey Semyonov (Serge)
1804fc6d05
merge kolibri-acpi #2151
...
git-svn-id: svn://kolibrios.org@2154 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 16:41:24 +00:00
Sergey Semyonov (Serge)
81a07b7206
kernel heap: new allocator for block descriptors
...
git-svn-id: svn://kolibrios.org@2151 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 15:59:54 +00:00
Sergey Semyonov (Serge)
d7ea1d9270
merge trunk 2149
...
git-svn-id: svn://kolibrios.org@2150 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 09:02:01 +00:00
Sergey Semyonov (Serge)
87882ebc37
v86: fix wrong irq number
...
git-svn-id: svn://kolibrios.org@2149 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-03 08:04:20 +00:00
CleverMouse
eca36f7ef4
socket.inc: fix for r2129
...
git-svn-id: svn://kolibrios.org@2147 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:48:37 +00:00
CleverMouse
a3388c45de
sync with r2143 except for a typo
...
git-svn-id: svn://kolibrios.org@2146 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:32:21 +00:00
CleverMouse
a632fb94b0
fix virtual root enumeration broken in r2129
...
git-svn-id: svn://kolibrios.org@2145 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:03:49 +00:00
Sergey Semyonov (Serge)
1edac8b45a
acpi:rework mutexes
...
git-svn-id: svn://kolibrios.org@2143 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 06:58:48 +00:00
Sergey Semyonov (Serge)
3c8db1907e
merge trunk
...
git-svn-id: svn://kolibrios.org@2142 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-01 16:29:55 +00:00
Sergey Semyonov (Serge)
7df91a3195
Kernel: initialize keyboard before mouse
...
git-svn-id: svn://kolibrios.org@2141 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-01 06:55:15 +00:00
CleverMouse
57633abf05
support for PnP disks, part 2: adapt current caching
...
git-svn-id: svn://kolibrios.org@2140 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-31 16:26:51 +00:00
Sergey Semyonov (Serge)
2cc416a4d8
kernel heap: minor improvements
...
git-svn-id: svn://kolibrios.org@2138 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-30 20:51:22 +00:00
CleverMouse
c33c39a421
fix mutex_unlock
...
git-svn-id: svn://kolibrios.org@2137 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-30 14:03:36 +00:00
Sergey Semyonov (Serge)
836a2f71bd
merge trunk
...
git-svn-id: svn://kolibrios.org@2130 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-27 11:24:26 +00:00
Sergey Semyonov (Serge)
246c135659
irq: reset fail counter
...
all kernel: replace old non-blocking mutexes
git-svn-id: svn://kolibrios.org@2129 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-27 10:59:48 +00:00
CleverMouse
3ec60d2e42
forgotten include
...
git-svn-id: svn://kolibrios.org@2123 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-26 11:51:56 +00:00
CleverMouse
fa7b5eb6e1
kernel timers
...
git-svn-id: svn://kolibrios.org@2122 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-26 11:46:54 +00:00
CleverMouse
cdeeb6be66
support for PnP disks: add exports and docs
...
git-svn-id: svn://kolibrios.org@2120 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 19:58:37 +00:00
CleverMouse
1eb4e63e51
support for PnP disks, part 1
...
git-svn-id: svn://kolibrios.org@2119 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 18:32:14 +00:00
Sergey Semyonov (Serge)
0c8c27e46c
move PIC functions into separate file
...
git-svn-id: svn://kolibrios.org@2118 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 09:32:01 +00:00
CleverMouse
a722eb5c4d
get sizeof.* really working for struct/ends definitions
...
git-svn-id: svn://kolibrios.org@2115 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 13:11:18 +00:00
Sergey Semyonov (Serge)
a7589ea8ee
restore previous version_inf
...
git-svn-id: svn://kolibrios.org@2114 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:25:47 +00:00
Sergey Semyonov (Serge)
0d01bde3f5
missing irq.inc
...
git-svn-id: svn://kolibrios.org@2113 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:03:45 +00:00
Sergey Semyonov (Serge)
000b6ce1cb
shared irq's
...
git-svn-id: svn://kolibrios.org@2112 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:01:37 +00:00
Sergey Semyonov (Serge)
e711a754bc
move irq functions into separate file
...
git-svn-id: svn://kolibrios.org@2106 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-23 12:25:29 +00:00
maximYCH
7f63a7e064
Russian language for kernel boot messages
...
git-svn-id: svn://kolibrios.org@2104 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-23 07:32:13 +00:00
Marat Zakiyanov (Mario79)
b3bbdbcdf1
Correct for r2101 "force behaviour as before r1992"
...
git-svn-id: svn://kolibrios.org@2103 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 17:10:02 +00:00
CleverMouse
1b390fd667
force behaviour as before r1989, r1992
...
git-svn-id: svn://kolibrios.org@2101 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 15:39:22 +00:00
Sergey Semyonov (Serge)
5a5c11b26d
remove unused code
...
git-svn-id: svn://kolibrios.org@2100 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 09:49:26 +00:00
Sergey Semyonov (Serge)
5ece1eb408
update documentation
...
git-svn-id: svn://kolibrios.org@2090 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-21 12:31:48 +00:00
Sergey Semyonov (Serge)
b3a861cedd
remove fn 41,42,44,45
...
git-svn-id: svn://kolibrios.org@2089 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-21 12:26:22 +00:00
Marat Zakiyanov (Mario79)
fe72383413
Fix for Floppy/IRQ6 - broken from r.1380
...
git-svn-id: svn://kolibrios.org@2084 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-20 15:18:25 +00:00
Sergey Semyonov (Serge)
4e1ac7b0d6
new irq handling
...
git-svn-id: svn://kolibrios.org@2050 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-16 11:34:07 +00:00
Sergey Semyonov (Serge)
416dc8b600
IRQH code
...
git-svn-id: svn://kolibrios.org@2049 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-15 20:34:55 +00:00
Artem Jerdev (art_zh)
2a927db105
direct detection of available memory
...
git-svn-id: svn://kolibrios.org@2047 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-14 09:08:02 +00:00
Mihail Semenyako (mike.dld)
74263ea13b
fs_HdDelete:
...
* correct check for ext2 partition type (never reached ext2 implementation)
reserve_cd_channel:
* jump to correct label (wrong channel was being reserved if retry occured)
* re-enable interrupts (were being masked upon proc return)
git-svn-id: svn://kolibrios.org@2044 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-10 19:21:44 +00:00
Sergey Semyonov (Serge)
d75c968b8e
fix pci irq's
...
git-svn-id: svn://kolibrios.org@2015 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-24 07:26:00 +00:00
Artem Jerdev (art_zh)
e338e5353f
getting smaller and closer to real hardware...
...
git-svn-id: svn://kolibrios.org@2014 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-23 15:27:18 +00:00
Mihail Semenyako (mike.dld)
bf2709cd21
Forum defect (post #35194 , by Leency): mouse wheel events aren't sent after clicking window border
...
git-svn-id: svn://kolibrios.org@2011 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-22 18:44:08 +00:00
Sergey Semyonov (Serge)
f59df34e17
merge trunk
...
git-svn-id: svn://kolibrios.org@2010 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-22 18:08:47 +00:00
CleverMouse
0462949132
allow hooks of IRQ6
...
git-svn-id: svn://kolibrios.org@1992 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-01 10:03:33 +00:00
CleverMouse
3421ffa999
allow hooks of IRQ15
...
git-svn-id: svn://kolibrios.org@1989 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-29 11:57:56 +00:00
Yogev Ezra
eed73247e9
Add sources of APM driver (by Staper) and battery driver (by Gluk)
...
git-svn-id: svn://kolibrios.org@1980 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-25 15:19:38 +00:00
CleverMouse
08246cd957
merge kolibri-cfg into trunk
...
git-svn-id: svn://kolibrios.org@1962 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-16 17:09:40 +00:00
Sergey Semyonov (Serge)
41be6ba563
remove deprecated code
...
git-svn-id: svn://kolibrios.org@1960 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-15 05:02:01 +00:00
Artem Jerdev (art_zh)
a3746b98d0
stable corebootable version
...
git-svn-id: svn://kolibrios.org@1952 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-12 17:56:51 +00:00
CleverMouse
b0b34108f2
kolibri-cfg: fixes in fat32 bootloader
...
git-svn-id: svn://kolibrios.org@1950 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-08 18:43:41 +00:00
CleverMouse
64c3c758d5
fix of r1941
...
git-svn-id: svn://kolibrios.org@1949 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-08 10:50:00 +00:00
CleverMouse
a168687ac8
@notify user on #UD exception
...
git-svn-id: svn://kolibrios.org@1948 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-06 15:00:38 +00:00
CleverMouse
7b2b309d03
kernel branch with configurable boot
...
git-svn-id: svn://kolibrios.org@1942 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-30 10:27:45 +00:00
Artem Jerdev (art_zh)
96673e3ce5
kernel constants compression/relocation
...
git-svn-id: svn://kolibrios.org@1941 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-30 10:11:03 +00:00
Artem Jerdev (art_zh)
e37372cd01
bootloader optimization
...
git-svn-id: svn://kolibrios.org@1940 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-28 07:32:24 +00:00
Artem Jerdev (art_zh)
83c504b87c
just a minor optimisation
...
git-svn-id: svn://kolibrios.org@1930 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-13 13:11:10 +00:00
Artem Jerdev (art_zh)
883ade9e49
gfx-revertion bugs liced
...
git-svn-id: svn://kolibrios.org@1929 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-12 23:22:18 +00:00
Artem Jerdev (art_zh)
7413c9cd9d
1) gfx reverted to stable version 1710
...
2) Phenom and Fusion CPUs supported
3) RDMSR syscall added
git-svn-id: svn://kolibrios.org@1928 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-10 12:43:03 +00:00
Asper
22602ae43d
Fix previous rev
...
git-svn-id: svn://kolibrios.org@1917 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-04-02 17:13:02 +00:00
Asper
918d343097
Infinity without MMX+ instructions
...
git-svn-id: svn://kolibrios.org@1916 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-04-02 16:47:56 +00:00
Asper
3cf149de61
Removing of dublicating driver
...
git-svn-id: svn://kolibrios.org@1915 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-04-02 12:00:39 +00:00
CleverMouse
00ac1c33b5
vidintel: support for pre-i9xx videocards
...
git-svn-id: svn://kolibrios.org@1912 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-03-29 18:06:54 +00:00
CleverMouse
c4f8c8e404
test error condition in the wait loop
...
git-svn-id: svn://kolibrios.org@1909 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-03-23 12:39:34 +00:00
Artem Jerdev (art_zh)
812af66c89
Kolibri-A: new graph engine = BUGGY VERSION! =
...
git-svn-id: svn://kolibrios.org@1899 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-03-04 12:09:10 +00:00
Sergey Semyonov (Serge)
08a08faa58
kernel: new blitter
...
git-svn-id: svn://kolibrios.org@1894 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-03-01 06:08:11 +00:00
hidnplayr
4638ba887e
Updated R6040 driver for net branch:
...
Fixed typo, cleaned up, disabled excessive debug output.
git-svn-id: svn://kolibrios.org@1893 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-28 19:20:47 +00:00
hidnplayr
1b801e1c89
Updated r6040 driver for net branch
...
git-svn-id: svn://kolibrios.org@1889 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-25 16:14:21 +00:00
Yogev Ezra
62a811ce4f
Linux name fix
...
git-svn-id: svn://kolibrios.org@1888 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-24 20:22:13 +00:00
hidnplayr
77f1a07bff
R6040 driver for trunk kernel
...
git-svn-id: svn://kolibrios.org@1887 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-24 17:25:38 +00:00
hidnplayr
76fa3151d7
R6040 driver for net branch
...
git-svn-id: svn://kolibrios.org@1886 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-24 17:15:24 +00:00
hidnplayr
d19fc735da
Added some stub functions to net_branch
...
git-svn-id: svn://kolibrios.org@1885 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-24 14:16:02 +00:00
Sergey Semyonov (Serge)
0e98f2ea01
int13_call: vm86 hotfix
...
git-svn-id: svn://kolibrios.org@1878 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-17 17:40:53 +00:00
Sergey Semyonov (Serge)
59c4b700c1
kernel: set_keyboard_data
...
git-svn-id: svn://kolibrios.org@1874 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-17 11:30:41 +00:00
Artem Jerdev (art_zh)
542cb02cea
new "tiled" graph engine (* buggy version *)
...
git-svn-id: svn://kolibrios.org@1859 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-09 14:48:45 +00:00
hidnplayr
ba8ddae0aa
i586 compatability macros (CMOVcc substitutes) for NET branch
...
git-svn-id: svn://kolibrios.org@1857 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-08 19:11:36 +00:00
hidnplayr
08596896d2
Net branch:
...
-Updates in TCP code: accepting connections now works.
(TCPserv is able to send 'hello world!' to telnet client)
git-svn-id: svn://kolibrios.org@1838 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-03 21:35:16 +00:00
hidnplayr
80a3183e81
Net Branch:
...
TCPserv: very simple TCP server used to develop and debug TCP code.
git-svn-id: svn://kolibrios.org@1836 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-03 14:37:36 +00:00
hidnplayr
36e43113ac
Updates in NET branch:
...
- Added RST packet handling code
- Added SOCKET_isconnected
- Added ACK handeling in syn rcvd state (for passive open)
git-svn-id: svn://kolibrios.org@1831 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-01 17:00:04 +00:00
hidnplayr
0d53bac040
Bugfixes in Net branch:
...
- Fixed delayed ACK (misimplementation)
- Fixed zero window problem and checksum for TCP_respond_socket
git-svn-id: svn://kolibrios.org@1830 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-02-01 16:14:18 +00:00
hidnplayr
4ee220aebe
Fixed bug in RTL8169 interrupt procedure.
...
git-svn-id: svn://kolibrios.org@1823 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-31 18:45:19 +00:00
hidnplayr
8619f93e83
More TCP and sockets code
...
git-svn-id: svn://kolibrios.org@1774 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-28 23:07:25 +00:00
hidnplayr
2ba52e3e4a
More TCP updates + Socket states
...
git-svn-id: svn://kolibrios.org@1773 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-28 16:49:08 +00:00
hidnplayr
2861c164de
Small update in TCP_input
...
git-svn-id: svn://kolibrios.org@1772 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-28 16:16:31 +00:00
hidnplayr
db55961834
More updates to TCP code of new stack.
...
git-svn-id: svn://kolibrios.org@1763 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-24 22:01:54 +00:00
hidnplayr
6af42a9b8e
Bugfix of r1761
...
git-svn-id: svn://kolibrios.org@1762 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-23 23:56:32 +00:00
hidnplayr
e9daec20c8
Updates of TCP_output for net branch
...
git-svn-id: svn://kolibrios.org@1761 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-20 22:29:47 +00:00
CleverMouse
8e6834e370
modesetter for Intel videocards: fixes for pre-i965 cards
...
git-svn-id: svn://kolibrios.org@1750 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-19 12:34:28 +00:00
CleverMouse
6e9b64cde6
change path to repository in data/*/Makefile
...
git-svn-id: svn://kolibrios.org@1739 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-17 14:01:43 +00:00
CleverMouse
259f2ffcd1
fix parameters saving in floppy bootsector
...
git-svn-id: svn://kolibrios.org@1738 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-01-17 12:41:44 +00:00