Commit Graph

1177 Commits

Author SHA1 Message Date
Marat Zakiyanov (Mario79)
36115aba3f Using the new mutex to r.2486
git-svn-id: svn://kolibrios.org@2489 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-21 22:48:54 +00:00
Marat Zakiyanov (Mario79)
b4268eda9f Fix for r. 1275 - to use the CLI command is not a good solution. Much better to use a mutex!
git-svn-id: svn://kolibrios.org@2486 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-21 11:48:46 +00:00
Marat Zakiyanov (Mario79)
3bd1f7b7ce 1) Fix for r. 2480
2) Corrected memmap.inc

git-svn-id: svn://kolibrios.org@2485 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-20 23:01:50 +00:00
Marat Zakiyanov (Mario79)
3e1a592489 Fix f.37.4 - LOAD_INDIRECT sets the correct hotspot of cursor is now.
git-svn-id: svn://kolibrios.org@2483 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-20 14:57:16 +00:00
Marat Zakiyanov (Mario79)
4ba4f03104 Fix for r.2446 - for Qemu or non-standart videocards. Unfortunately [BytesPerScanLine] does not always equal to [_display.width]*[ScreenBPP]/8
git-svn-id: svn://kolibrios.org@2480 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-19 20:56:55 +00:00
Marat Zakiyanov (Mario79)
4d909756cd Fix for r. 2446
git-svn-id: svn://kolibrios.org@2477 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-19 10:29:02 +00:00
Sergey Semyonov (Serge)
b7914ab4cd fix old and stupid bug in cursor creation code
git-svn-id: svn://kolibrios.org@2473 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-16 21:12:10 +00:00
Marat Zakiyanov (Mario79)
bff46d5384 Fix for r. 2430
git-svn-id: svn://kolibrios.org@2472 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-16 18:12:05 +00:00
Artem Jerdev (art_zh)
ce9ffe8571 Nonscalable Vectorized Fonts: the Parser!
git-svn-id: svn://kolibrios.org@2470 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 23:11:54 +00:00
Marat Zakiyanov (Mario79)
160c847c88 Fix for r.2430 - guarantee the updating data after f. 18.2 and f. 18.18
git-svn-id: svn://kolibrios.org@2468 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 16:38:53 +00:00
Sergey Semyonov (Serge)
357566b767 acpi: new clipping code
git-svn-id: svn://kolibrios.org@2467 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 15:34:46 +00:00
Sergey Semyonov (Serge)
791845236e merge acpi
git-svn-id: svn://kolibrios.org@2466 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 13:05:45 +00:00
Sergey Semyonov (Serge)
c3da687125 acpi: merge trunk
git-svn-id: svn://kolibrios.org@2465 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 12:41:29 +00:00
Marat Zakiyanov (Mario79)
272e29533c Fix for drawbackground mode of tiled.
git-svn-id: svn://kolibrios.org@2464 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 11:15:06 +00:00
Marat Zakiyanov (Mario79)
cd505ed9b1 Fix rolledup window for r. 2423
git-svn-id: svn://kolibrios.org@2463 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 09:47:22 +00:00
Artem Jerdev (art_zh)
30883bfc24 New font engine in progress
git-svn-id: svn://kolibrios.org@2461 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 01:02:08 +00:00
hidnplayr
91f85b6476 Removed copyright notice from struct.inc
Struct.inc is a file that comes bundled with FASM.

git-svn-id: svn://kolibrios.org@2460 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-14 09:49:09 +00:00
Marat Zakiyanov (Mario79)
3fc3a46bdb Correction for r.2451
git-svn-id: svn://kolibrios.org@2459 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-14 09:45:55 +00:00
Marat Zakiyanov (Mario79)
5e7b91ce25 Correction for r.2423
git-svn-id: svn://kolibrios.org@2458 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-14 09:29:38 +00:00
Marat Zakiyanov (Mario79)
f928705342 Correction of previous revision.
git-svn-id: svn://kolibrios.org@2456 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-13 19:10:27 +00:00
Marat Zakiyanov (Mario79)
2f699083c4 1) Correcting information about copiright
2) VESA draw the small speedup

git-svn-id: svn://kolibrios.org@2455 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-13 16:51:57 +00:00
Sergey Semyonov (Serge)
bca9931e5d try to load HDA driver, as requested
git-svn-id: svn://kolibrios.org@2454 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-12 18:53:48 +00:00
Marat Zakiyanov (Mario79)
54ec7e5e23 Video draw and VESA - some speedup.
git-svn-id: svn://kolibrios.org@2453 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-12 18:26:37 +00:00
Marat Zakiyanov (Mario79)
c039e0039c Fix previous kernel revision for debugging with MTDBG.
git-svn-id: svn://kolibrios.org@2452 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-12 11:16:00 +00:00
Marat Zakiyanov (Mario79)
145124ff4e VESA draw the small speedup
git-svn-id: svn://kolibrios.org@2451 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-11 20:36:29 +00:00
Marat Zakiyanov (Mario79)
1e9db5557e Draw mouse pointer after restore the default pointer.
git-svn-id: svn://kolibrios.org@2450 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-11 18:04:22 +00:00
Marat Zakiyanov (Mario79)
30d819787b Fix blitter for previous revision.
git-svn-id: svn://kolibrios.org@2449 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-11 17:29:24 +00:00
Marat Zakiyanov (Mario79)
91e683bb90 Compatibility with hardware cursor (fix for r.2430 and later)
git-svn-id: svn://kolibrios.org@2448 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-10 17:36:55 +00:00
Marat Zakiyanov (Mario79)
d357a70fe3 Video draw some speedup.
git-svn-id: svn://kolibrios.org@2446 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-10 11:37:42 +00:00
Sergey Semyonov (Serge)
134b326402 display_t: restore order of variables. Keep this structure coherent with drivers.
git-svn-id: svn://kolibrios.org@2445 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-10 11:36:26 +00:00
Sergey Semyonov (Serge)
2f5fd7a295 trunk: print cpu count on the debug board
git-svn-id: svn://kolibrios.org@2443 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 15:50:49 +00:00
Sergey Semyonov (Serge)
3340831e5e acpi:print e820 memory map
git-svn-id: svn://kolibrios.org@2442 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 12:55:55 +00:00
Sergey Semyonov (Serge)
6dcd9aa69b acpi:print cpu count
git-svn-id: svn://kolibrios.org@2441 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 11:35:26 +00:00
Marat Zakiyanov (Mario79)
6f8e8ebd03 Small fix for r. 2438
git-svn-id: svn://kolibrios.org@2440 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 10:44:41 +00:00
Sergey Semyonov (Serge)
3e6513d51d enumerate CPU's and start AP.
git-svn-id: svn://kolibrios.org@2439 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 08:20:02 +00:00
Marat Zakiyanov (Mario79)
4832ce7a33 VESA draw some speedup (line, points, text, numbers)
git-svn-id: svn://kolibrios.org@2438 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 19:10:26 +00:00
Sergey Semyonov (Serge)
1fca7a07cb Can we start AP, please ?
git-svn-id: svn://kolibrios.org@2437 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 15:49:27 +00:00
Marat Zakiyanov (Mario79)
aede9dbee9 1) VESA draw some speedup
2) VGA draw fix

git-svn-id: svn://kolibrios.org@2436 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 13:45:18 +00:00
Marat Zakiyanov (Mario79)
e89bf78ced VESA putimage speedup +30% above the r.2430
git-svn-id: svn://kolibrios.org@2435 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 09:22:41 +00:00
Sergey Semyonov (Serge)
c856b49825 merge trunk
git-svn-id: svn://kolibrios.org@2434 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 08:33:38 +00:00
Marat Zakiyanov (Mario79)
b39e0fcab7 VESA - new algorithm for showing mouse pointer without a blink
git-svn-id: svn://kolibrios.org@2430 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-07 15:50:41 +00:00
Marat Zakiyanov (Mario79)
0f6f6895e1 Addition fix for r. 2414 and 2424 - checking for bit 31 of f.40
git-svn-id: svn://kolibrios.org@2426 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-01 06:28:52 +00:00
Artem Jerdev (art_zh)
c1e1e0ac8a system starts faster (minus 250 milliseconds)
git-svn-id: svn://kolibrios.org@2425 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-01 01:22:24 +00:00
Marat Zakiyanov (Mario79)
085a190723 Restore code commented from r.2414 - this is good code! See r. 1466 and 1513.
git-svn-id: svn://kolibrios.org@2424 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-29 23:27:35 +00:00
Marat Zakiyanov (Mario79)
570e99f573 Removing the "blinking" of redrawing titlebar for skinned window (type III and IV)
git-svn-id: svn://kolibrios.org@2423 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-29 23:03:13 +00:00
Sergey Semyonov (Serge)
0735fd9e1b fn.40: ebx bit 30 - do not send mouse events if cursor outside window
git-svn-id: svn://kolibrios.org@2414 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-28 08:36:15 +00:00
Sergey Semyonov (Serge)
a6898aa575 change application heap size and shared dll locations
git-svn-id: svn://kolibrios.org@2412 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-27 08:28:06 +00:00
Sergey Semyonov (Serge)
db320404f9 and again fn.40: now ebx bit 31 - do not send mouse events to inactive window
git-svn-id: svn://kolibrios.org@2411 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-27 07:04:31 +00:00
Sergey Semyonov (Serge)
e7a3df5e7c fn. 40 API last time changes
git-svn-id: svn://kolibrios.org@2410 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-27 05:38:15 +00:00
Sergey Semyonov (Serge)
faf020ed36 update documentation
git-svn-id: svn://kolibrios.org@2409 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-26 04:22:47 +00:00
Sergey Semyonov (Serge)
ce677ba734 f.40 ebx bit 3: do not send mouse events to inactive window
git-svn-id: svn://kolibrios.org@2408 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-26 04:10:05 +00:00
Marat Zakiyanov (Mario79)
539071c806 We do not use Vesa 1.2 mode (for trunk kernel) is now
git-svn-id: svn://kolibrios.org@2407 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-26 00:26:08 +00:00
hidnplayr
946e05cb81 Fixed socket_ring_write in net branch.
git-svn-id: svn://kolibrios.org@2404 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 13:02:09 +00:00
hidnplayr
4aee41218a Forgot init_mutex ...
git-svn-id: svn://kolibrios.org@2403 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:07:41 +00:00
hidnplayr
815cb2a26f Usage of new mutexes in net branch.
git-svn-id: svn://kolibrios.org@2402 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:03:22 +00:00
hidnplayr
0478f45357 Bugfix in PCnet32 driver for net branch
git-svn-id: svn://kolibrios.org@2401 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-24 22:04:04 +00:00
Sergey Semyonov (Serge)
8c4037718d new 68.26 user_unmap(void* block_base, unsigned int offset, size_t unmap_size);
git-svn-id: svn://kolibrios.org@2400 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-24 21:47:01 +00:00
Marat Zakiyanov (Mario79)
e4aa2672b0 Decrease size of shadow buffer for VGA. The old size is 2-fold excess of actual need.
git-svn-id: svn://kolibrios.org@2398 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-24 19:20:05 +00:00
hidnplayr
85c176d7f5 Fixed TCP and UDP checksum in net branch.
git-svn-id: svn://kolibrios.org@2390 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 22:21:40 +00:00
hidnplayr
997d83d275 Added error reporting to some of the network drivers in net branch
git-svn-id: svn://kolibrios.org@2387 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 21:18:16 +00:00
hidnplayr
d0e0776223 Fixed ICMP in net branch
git-svn-id: svn://kolibrios.org@2386 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 20:35:40 +00:00
hidnplayr
33ab203c14 Sync net branch with trunk
git-svn-id: svn://kolibrios.org@2385 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 19:01:26 +00:00
hidnplayr
e7bade16fe Adapted more structures to use new struct.inc
git-svn-id: svn://kolibrios.org@2384 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 18:52:13 +00:00
hidnplayr
e6242dd229 Synced net branch with trunk
git-svn-id: svn://kolibrios.org@2382 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 16:06:05 +00:00
hidnplayr
58fe32f210 Usage of struct.inc from fasm in trunk kernel.
git-svn-id: svn://kolibrios.org@2381 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 15:46:09 +00:00
hidnplayr
586aa010e8 Trying to fix the makefile for new stack
git-svn-id: svn://kolibrios.org@2373 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 13:20:18 +00:00
hidnplayr
8030c874a3 Fixed problem with UDP_input when checksum was 0.
git-svn-id: svn://kolibrios.org@2369 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 10:44:57 +00:00
hidnplayr
dc66507e60 Bugfixes in net branch:
-Disabled UDP remote IP checking because it blocks valid packets in certain situations (DNS resolving)
-Removed device '0' (application level) as default device because it was not correctly implemented and would require a lot of changes. Yet need to find a better solution for this.

git-svn-id: svn://kolibrios.org@2366 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 14:09:00 +00:00
hidnplayr
599bb8d0bd Reserved sysfn 74,75,76 in trunk for new stack.
git-svn-id: svn://kolibrios.org@2365 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 11:00:54 +00:00
hidnplayr
e8a8f9b75d Changed net branch specific kernel function numbers to make room for function 73 in main branch.
git-svn-id: svn://kolibrios.org@2364 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 10:57:36 +00:00
hidnplayr
f156bb294d Markup changes in net branch + updates in TCP_output
git-svn-id: svn://kolibrios.org@2362 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 08:44:51 +00:00
Sergey Semyonov (Serge)
d328d0e037 export destroy_event and timer_hs
git-svn-id: svn://kolibrios.org@2356 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-19 12:48:21 +00:00
Marat Zakiyanov (Mario79)
a2109c90b2 Fix for f38 - correction for the remainder of the division
git-svn-id: svn://kolibrios.org@2353 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-18 17:56:20 +00:00
Artem Jerdev (art_zh)
db3a775207 one old and stupid bug fixed
git-svn-id: svn://kolibrios.org@2350 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-15 22:56:09 +00:00
Sergey Semyonov (Serge)
9dadf069ea export free_page
git-svn-id: svn://kolibrios.org@2343 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-04 13:21:17 +00:00
Sergey Semyonov (Serge)
5491cb4d99 blitter prerequisite
git-svn-id: svn://kolibrios.org@2341 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-02 08:42:35 +00:00
Sergey Semyonov (Serge)
adce55500e remove deleted cursor from cursor's list
git-svn-id: svn://kolibrios.org@2337 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-01-25 03:56:53 +00:00
Artem Jerdev (art_zh)
57c28de885 new font engine
git-svn-id: svn://kolibrios.org@2322 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-29 09:40:16 +00:00
Artem Jerdev (art_zh)
9e4294fe02 sysfont parser bugfix
git-svn-id: svn://kolibrios.org@2321 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-28 21:26:53 +00:00
Artem Jerdev (art_zh)
7ab46af0a7 sysfont parser
git-svn-id: svn://kolibrios.org@2320 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-28 01:09:32 +00:00
Artem Jerdev (art_zh)
c01092c6cf new font engine
git-svn-id: svn://kolibrios.org@2318 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-26 01:25:06 +00:00
Artem Jerdev (art_zh)
e1ef1272a2 vectorized system font #0 (data)
git-svn-id: svn://kolibrios.org@2316 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-14 21:37:38 +00:00
hidnplayr
c518777ac6 NET branch: Fixed errors in socket_open and socket_fork
git-svn-id: svn://kolibrios.org@2315 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 16:17:05 +00:00
hidnplayr
61a835651a -Fixed build.bat for NET branch
-Removed some unrelated files
-updates in telnet

git-svn-id: svn://kolibrios.org@2314 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 15:19:27 +00:00
hidnplayr
dfbe402a16 Updated i8255x driver for NET branch
git-svn-id: svn://kolibrios.org@2313 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:29:43 +00:00
hidnplayr
82c4a67737 Added missing struct.inc to NET branch
git-svn-id: svn://kolibrios.org@2312 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:23:38 +00:00
hidnplayr
343d6e80ca more small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2311 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 22:35:01 +00:00
hidnplayr
3ce07b4be0 more small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2310 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 20:05:07 +00:00
hidnplayr
29c0d093db small updates and fixes in TCP for net branch
git-svn-id: svn://kolibrios.org@2309 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 19:20:33 +00:00
hidnplayr
63bc53c598 small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2308 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 15:39:15 +00:00
hidnplayr
df1f1777ac Re-enabled i8255x card 1068:8086.
git-svn-id: svn://kolibrios.org@2307 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 14:09:30 +00:00
hidnplayr
dea41c44ce re-enabled rtl8139 card in trunk kernel, it was disabled by error in r1887
git-svn-id: svn://kolibrios.org@2306 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-09 20:03:39 +00:00
hidnplayr
255c2b5ab3 NET branch: re-organised all structs to use struct.inc from fasm
git-svn-id: svn://kolibrios.org@2305 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 23:06:26 +00:00
hidnplayr
92f2253d7a Making SIS900 driver for net branch compileable
git-svn-id: svn://kolibrios.org@2304 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 17:24:46 +00:00
hidnplayr
292477fb7c More of the same
git-svn-id: svn://kolibrios.org@2303 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 22:36:05 +00:00
hidnplayr
b2a283b9fe Removed unnescessary typecasts in net branch
git-svn-id: svn://kolibrios.org@2302 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 22:08:40 +00:00
hidnplayr
8aee69dafb Replaced some of the 'magic numbers' in net branch with constants.
git-svn-id: svn://kolibrios.org@2301 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 21:03:20 +00:00
hidnplayr
b7875fe3bf Fixed Unsigned jumps in net branch
git-svn-id: svn://kolibrios.org@2300 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 20:25:47 +00:00
CleverMouse
037099f50d Style corrected for new rules, no semantic changes
git-svn-id: svn://kolibrios.org@2288 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-14 21:38:50 +00:00
Sergey Semyonov (Serge)
822829ea70 merge trunk
git-svn-id: svn://kolibrios.org@2268 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-05 11:14:40 +00:00