merged trunk

git-svn-id: svn://kolibrios.org@438 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge)
2007-03-29 11:57:39 +00:00
parent 54dc123015
commit f72fabb279
11 changed files with 198 additions and 230 deletions

View File

@@ -52,7 +52,9 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; $Revision$
include 'macros.inc'
$Revision$
include "proc32.inc"
include "kglobals.inc"
@@ -107,6 +109,7 @@ use16
version db 'Kolibri OS version 0.6.5.0 ',13,10,13,10,0
include "boot/bootstr.inc" ; language-independent boot messages
include "boot/preboot.inc"
if lang eq en
@@ -5034,6 +5037,8 @@ yes_shutdown_param:
include "data32.inc"
__REV__ = __REV
uglobals_size = $ - endofcode
diff16 "end of kernel code",0,$