hidnplayr
20ce7bf7bd
bugfix in SOCKET_bind
...
git-svn-id: svn://kolibrios.org@3637 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-10 18:56:49 +00:00
CleverMouse
afab73e955
fix sysfn 70.4 with new size = current size
...
git-svn-id: svn://kolibrios.org@3631 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-10 11:00:38 +00:00
Sergey Semyonov (Serge)
c5b8b35a47
acpi: a hopeless attempt to optimize the kernel memory
...
git-svn-id: svn://kolibrios.org@3629 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-09 07:32:33 +00:00
Sergey Semyonov (Serge)
f272bbb588
kernel: reduce DRIVE_DATA array. Now kernel can handle only 64 /hd and /cd partitions
...
git-svn-id: svn://kolibrios.org@3627 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-08 13:08:51 +00:00
Sergey Semyonov (Serge)
61f55267ef
acpi:update
...
git-svn-id: svn://kolibrios.org@3626 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-08 13:00:38 +00:00
CleverMouse
bf4022be57
be more fair
...
git-svn-id: svn://kolibrios.org@3617 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-07 17:05:31 +00:00
CleverMouse
30b17fb697
allow high-priority threads to wakeup after any IRQ, not just timer
...
git-svn-id: svn://kolibrios.org@3615 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-07 16:46:52 +00:00
shikhin
d4216492e1
Fixed sys_msg_board (fn 63) to not rely on cross_order and take arguments in original order.
...
git-svn-id: svn://kolibrios.org@3614 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-07 14:12:54 +00:00
CleverMouse
37b9069351
preprocess fat chain for ramdisk before APIC initialization accesses it
...
git-svn-id: svn://kolibrios.org@3613 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-07 08:46:54 +00:00
CleverMouse
5f85d6b8f5
fix r3536
...
git-svn-id: svn://kolibrios.org@3611 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-06 10:50:52 +00:00
hidnplayr
c30fb05dcc
Loopback device now works with entire 127.0.0.1/8 range, and also keeps some stats.
...
git-svn-id: svn://kolibrios.org@3610 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-06 06:08:45 +00:00
hidnplayr
e395aa6070
bugfixes in ARP
...
git-svn-id: svn://kolibrios.org@3609 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-06 05:19:15 +00:00
Sergey Semyonov (Serge)
a678afc6ad
kernel: BytesPerScanLine removed, use _display.pitch instead
...
git-svn-id: svn://kolibrios.org@3606 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-05 09:29:50 +00:00
hidnplayr
52893d0ce3
More timer bugfixes for TCP_output.
...
git-svn-id: svn://kolibrios.org@3603 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-05 00:53:57 +00:00
hidnplayr
7ce53df3a1
Fixed bugs in new ARP code and TCP_output.
...
git-svn-id: svn://kolibrios.org@3602 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-05 00:44:59 +00:00
hidnplayr
c0fe9dddf7
Improved loopback device, separate ARP tables for every interface, added arpstat functionality to netstat, preparing zeroconf to work on multiple interfaces, improved API (fn 76, fn 74), fixed some bugs.
...
git-svn-id: svn://kolibrios.org@3601 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-05 00:21:20 +00:00
hidnplayr
c2bc66096c
Renamed some variables and constants in network code, removed NET_set_default function, improved TCP timers
...
git-svn-id: svn://kolibrios.org@3600 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-04 14:12:37 +00:00
CleverMouse
1267799afd
do not use macro in sec_loader
...
git-svn-id: svn://kolibrios.org@3599 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-04 11:16:20 +00:00
CleverMouse
a77e7ee15d
make macro for push imm/pop dst
...
git-svn-id: svn://kolibrios.org@3598 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-04 11:14:37 +00:00
Sergey Semyonov (Serge)
e80ec77b74
kernel: epic win. return to new cheat delay_hs
...
git-svn-id: svn://kolibrios.org@3597 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-04 08:04:42 +00:00
Sergey Semyonov (Serge)
a830f8e6f3
kernel: epic fail. revert to old delay_hs code
...
git-svn-id: svn://kolibrios.org@3596 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-03 20:16:51 +00:00
Sergey Semyonov (Serge)
315305ed2a
Kernel: cheap and cheat delay_hs
...
git-svn-id: svn://kolibrios.org@3595 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-03 19:47:50 +00:00
Sergey Semyonov (Serge)
ddb6fa98f4
kernel: quick fix for 3588
...
git-svn-id: svn://kolibrios.org@3592 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-03 10:50:25 +00:00
Sergey Semyonov (Serge)
5ad3d16abe
kernel: enable these ugly 24bpp videomodes again
...
git-svn-id: svn://kolibrios.org@3591 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-03 10:35:59 +00:00
Sergey Semyonov (Serge)
8dd796543b
acpi:update
...
git-svn-id: svn://kolibrios.org@3589 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-02 10:40:22 +00:00
Sergey Semyonov (Serge)
996be4829b
kernel: minor optimizations
...
git-svn-id: svn://kolibrios.org@3588 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-06-02 09:36:14 +00:00
CleverMouse
01573335f1
and another one
...
git-svn-id: svn://kolibrios.org@3579 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-31 17:53:53 +00:00
CleverMouse
fd419b402d
make comment correct, resolve #64
...
git-svn-id: svn://kolibrios.org@3578 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-31 17:51:17 +00:00
CleverMouse
f5abfdf5cc
update documentation
...
git-svn-id: svn://kolibrios.org@3577 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-30 14:00:40 +00:00
Sergey Semyonov (Serge)
70b7b47b34
kernel: fix for 3558
...
git-svn-id: svn://kolibrios.org@3576 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-30 05:24:54 +00:00
Artem Jerdev (art_zh)
f138c2f662
Fusion frequencies detection
...
git-svn-id: svn://kolibrios.org@3573 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-29 23:16:18 +00:00
hidnplayr
49266cf1ea
Updated socket API documentation
...
git-svn-id: svn://kolibrios.org@3571 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-29 13:47:55 +00:00
CleverMouse
3fc8b505e2
remove old attempts to write something USB-related, they are not actual anymore
...
git-svn-id: svn://kolibrios.org@3568 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-29 12:48:49 +00:00
CleverMouse
c4636d1b86
remove hopelessly obsolete branch
...
git-svn-id: svn://kolibrios.org@3567 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-29 12:45:44 +00:00
hidnplayr
8e107a1443
Socket_receive: return -1 when socket is closed.
...
git-svn-id: svn://kolibrios.org@3565 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-29 11:46:06 +00:00
Sergey Semyonov (Serge)
f08dd2c7ab
Kernel: remove ENABLE_TASKSWITCH PS2_CHUNK stack_data_start eth_data_start eth_data_start stack_data_end resendQ
...
git-svn-id: svn://kolibrios.org@3560 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 19:56:59 +00:00
hidnplayr
0c73d15f63
Delete old net branch
...
git-svn-id: svn://kolibrios.org@3559 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 19:53:40 +00:00
Sergey Semyonov (Serge)
d81e718e9b
Kernel: remove useless MOUSE_DOWN MOUSE_BACKGROUND DONT_DRAW_MOUSE.
...
git-svn-id: svn://kolibrios.org@3558 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 19:40:50 +00:00
hidnplayr
e93a49b442
Disabled network debug output by default.
...
git-svn-id: svn://kolibrios.org@3556 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 19:19:23 +00:00
Sergey Semyonov (Serge)
3adc7b1d8e
acpi:update
...
git-svn-id: svn://kolibrios.org@3555 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 19:09:31 +00:00
hidnplayr
e4cf34c0de
Merge new network stack with trunk
...
git-svn-id: svn://kolibrios.org@3545 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 17:34:26 +00:00
CleverMouse
43f6a7d07a
restore sec_loader after r3539
...
git-svn-id: svn://kolibrios.org@3544 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 17:12:19 +00:00
CleverMouse
efb80df08b
never relink mouse handler
...
git-svn-id: svn://kolibrios.org@3543 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-28 16:29:26 +00:00
CleverMouse
b1b43099ea
add forgotten include
...
git-svn-id: svn://kolibrios.org@3540 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 22:19:11 +00:00
CleverMouse
32b4fcb9ab
recode all kernel sources to UTF-8; binary still uses single-byte encoding and isn't changed at all
...
git-svn-id: svn://kolibrios.org@3539 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 22:16:00 +00:00
CleverMouse
0a61fc62ad
remove sec_loader/trunk/kolibri_ldm: uncompilable copy of some kernel files
...
git-svn-id: svn://kolibrios.org@3538 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 21:37:45 +00:00
Sergey Semyonov (Serge)
8119f00711
kernel: remove ScreenBPP variable
...
git-svn-id: svn://kolibrios.org@3537 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 19:09:54 +00:00
CleverMouse
f427028551
fix some GUI problems highlighted by r3534
...
git-svn-id: svn://kolibrios.org@3536 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 16:49:46 +00:00
CleverMouse
bd6a09fefc
fix direct I/O access broken in r3534
...
git-svn-id: svn://kolibrios.org@3535 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 13:05:53 +00:00
CleverMouse
f059bc06d5
priorities in scheduler
...
git-svn-id: svn://kolibrios.org@3534 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-27 09:02:35 +00:00
Artem Jerdev (art_zh)
55496cc735
LAPIC timer interrupt test
...
git-svn-id: svn://kolibrios.org@3531 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-23 17:29:52 +00:00
Artem Jerdev (art_zh)
3aef84d056
minor corrections
...
git-svn-id: svn://kolibrios.org@3526 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-21 20:28:08 +00:00
CleverMouse
df1bbc6819
fix disk-full handling when creating a folder in ramdisk
...
git-svn-id: svn://kolibrios.org@3525 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-21 13:34:46 +00:00
CleverMouse
b7d54cce54
export USB API to drivers
...
git-svn-id: svn://kolibrios.org@3524 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-20 08:45:18 +00:00
hidnplayr
75882efdc9
Removed code trap (shouldnt have been comitted in the first place).
...
git-svn-id: svn://kolibrios.org@3523 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-18 10:55:03 +00:00
CleverMouse
4aaa9b7e36
that would be too verbose
...
git-svn-id: svn://kolibrios.org@3522 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-18 00:17:04 +00:00
CleverMouse
c1284fc3b6
USB support
...
git-svn-id: svn://kolibrios.org@3520 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 23:53:28 +00:00
Artem Jerdev (art_zh)
bcdfe175d7
APU mmio area: hack-ready
...
git-svn-id: svn://kolibrios.org@3519 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 17:17:20 +00:00
hidnplayr
a0f9d2e236
Fixed Network2 event (low level network event)
...
git-svn-id: svn://kolibrios.org@3518 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 13:33:04 +00:00
CleverMouse
b7bd43fe91
do not flood logs with unrecognized network packets
...
git-svn-id: svn://kolibrios.org@3517 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 13:32:52 +00:00
hidnplayr
7a6a47ea05
Renamed zeroconfig.ini to network.ini and moved to /sys/
...
git-svn-id: svn://kolibrios.org@3516 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 12:22:14 +00:00
hidnplayr
6bf8356208
Renamed IPv4_dest_to_dev to IPv4_route
...
git-svn-id: svn://kolibrios.org@3515 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 11:33:49 +00:00
hidnplayr
a8351928d4
SOCKET_is_disconnected now clears TCP and UDP ports.
...
git-svn-id: svn://kolibrios.org@3514 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-17 11:30:56 +00:00
CleverMouse
5f291d1d1c
small fix - 3
...
git-svn-id: svn://kolibrios.org@3513 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-16 21:15:02 +00:00
CleverMouse
0f3580df30
small fix - 2
...
git-svn-id: svn://kolibrios.org@3512 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-16 19:14:59 +00:00
CleverMouse
8573603b63
small fix
...
git-svn-id: svn://kolibrios.org@3511 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-16 18:45:41 +00:00
CleverMouse
0674683a36
correction for r3505: exclude IRQ6, 14, 15 and keyboard handler
...
git-svn-id: svn://kolibrios.org@3509 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-15 18:17:49 +00:00
CleverMouse
17945ca19c
force setting native resolution for intel displays
...
git-svn-id: svn://kolibrios.org@3508 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-15 18:03:17 +00:00
CleverMouse
1ffc38fb43
conditional printing of debug board to the screen
...
git-svn-id: svn://kolibrios.org@3507 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-15 16:40:59 +00:00
CleverMouse
c0389b4be3
+declaration
...
git-svn-id: svn://kolibrios.org@3506 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-15 15:13:51 +00:00
CleverMouse
9bae783f11
workaround for handlers registered with wrong IRQ
...
git-svn-id: svn://kolibrios.org@3505 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-15 15:10:55 +00:00
Marat Zakiyanov (Mario79)
f3b083075c
Kernel scheduler - equal rights for all threads. Discussion http://board.kolibrios.org/viewtopic.php?f=35&t=2303
...
git-svn-id: svn://kolibrios.org@3504 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-14 22:47:15 +00:00
Sergey Semyonov (Serge)
5e88b2cdeb
kernel: show cpu frequency in Mhz, not Hz
...
git-svn-id: svn://kolibrios.org@3502 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-11 20:53:01 +00:00
Sergey Semyonov (Serge)
b9d4fa554f
kernel: fix boot time cpu frequency information
...
git-svn-id: svn://kolibrios.org@3501 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-11 18:01:06 +00:00
Sergey Semyonov (Serge)
7f3e618a3a
kos_acpi:update
...
git-svn-id: svn://kolibrios.org@3500 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-11 12:38:27 +00:00
Marat Zakiyanov (Mario79)
f06345297e
Restore default cursor before terminating the process.
...
git-svn-id: svn://kolibrios.org@3493 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-03 22:00:44 +00:00
Artem Jerdev (art_zh)
f78035819c
some kernel cleaning...
...
git-svn-id: svn://kolibrios.org@3490 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-01 22:17:31 +00:00
Artem Jerdev (art_zh)
e07b0a88df
some kernel cleaning...
...
git-svn-id: svn://kolibrios.org@3489 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-01 20:06:02 +00:00
Artem Jerdev (art_zh)
9a9f1fd084
some kernel cleaning...
...
git-svn-id: svn://kolibrios.org@3488 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-01 20:02:18 +00:00
Artem Jerdev (art_zh)
08bb2f6f9f
good-bye floppy!
...
git-svn-id: svn://kolibrios.org@3487 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-05-01 19:48:56 +00:00
Sergey Semyonov (Serge)
d613a64038
kernel: cleanup
...
git-svn-id: svn://kolibrios.org@3486 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-28 12:43:27 +00:00
Sergey Semyonov (Serge)
d67b35544c
kernel: export GetCpuFreq
...
git-svn-id: svn://kolibrios.org@3481 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-26 10:57:25 +00:00
Marat Zakiyanov (Mario79)
8977965c09
Fix for r.2536
...
git-svn-id: svn://kolibrios.org@3462 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-09 18:17:01 +00:00
hidnplayr
2bc923d897
SOCKET_receive_stream returns 0 now when there is no data instead of -1.
...
git-svn-id: svn://kolibrios.org@3461 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-09 11:43:59 +00:00
CleverMouse
6edb329ec0
replace align with explicit padding (align in struct is silently ignored after r2381)
...
git-svn-id: svn://kolibrios.org@3460 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-09 11:40:03 +00:00
hidnplayr
1fc22f7bce
Experimental support for MSG_PEEK and MSG_DONTWAIT in SOCKET_receive_stream.
...
git-svn-id: svn://kolibrios.org@3459 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-09 10:47:23 +00:00
Marat Zakiyanov (Mario79)
37684e0d2a
Fix f.18.3 - If the window is captured and moved by the user, then you can't change the position in window stack.
...
git-svn-id: svn://kolibrios.org@3455 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-07 16:11:35 +00:00
Marat Zakiyanov (Mario79)
53d7a1b52f
trunk kernel: print svn revision on the debug board
...
git-svn-id: svn://kolibrios.org@3454 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-07 11:24:02 +00:00
Marat Zakiyanov (Mario79)
58f7495fc7
Fix f.67 for correct sequence of calling repaint the background (example KFAR, Fplay etc.)
...
git-svn-id: svn://kolibrios.org@3452 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-05 22:16:17 +00:00
Marat Zakiyanov (Mario79)
f08eb54025
Fix for f.72
...
git-svn-id: svn://kolibrios.org@3451 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-05 21:01:06 +00:00
CleverMouse
e61b3f010d
fix RamdiskDelete+FloppyDelete, they worked incorrectly since their introduction in r171
...
git-svn-id: svn://kolibrios.org@3442 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-04-02 14:55:10 +00:00
esevece
541cf8982e
Accept key S to save settings in spanish build
...
git-svn-id: svn://kolibrios.org@3430 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-27 16:58:27 +00:00
hidnplayr
287ae5e937
Fixed previous revision.
...
git-svn-id: svn://kolibrios.org@3429 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-26 21:39:35 +00:00
hidnplayr
e53d005571
Added Atheros to netcfg vendor list.
...
git-svn-id: svn://kolibrios.org@3428 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-26 21:35:38 +00:00
hidnplayr
fa2168cc4f
Fix typos from #2089 (reported by mikedld)
...
git-svn-id: svn://kolibrios.org@3426 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-26 20:10:37 +00:00
esevece
c1b0143546
Translating desktop to spanish
...
git-svn-id: svn://kolibrios.org@3416 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-26 02:16:58 +00:00
esevece
a3a6f17e0b
Translating desktop to spanish
...
git-svn-id: svn://kolibrios.org@3415 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-26 02:12:02 +00:00
hidnplayr
c9e26567fd
Fixed wait_event call for tcp_input.
...
git-svn-id: svn://kolibrios.org@3407 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-23 16:46:22 +00:00
hidnplayr
4398dd7c40
Preparing to implement TCP reassembly queue.
...
Some cleanup of tcp_input and skip checksum recalculation for loopback segments.
git-svn-id: svn://kolibrios.org@3406 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-23 14:02:38 +00:00
hidnplayr
372fe91892
Sync net branch with trunk
...
git-svn-id: svn://kolibrios.org@3405 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-23 11:56:23 +00:00