neu

[reactos.git] / os2 / lib / doscalls / doscalls.def

diff --git a/os2/lib/doscalls/doscalls.def b/os2/lib/doscalls/doscalls.def
index 0715fe2..20ace6c 100644 (file)
--- a/os2/lib/doscalls/doscalls.def
+++ b/os2/lib/doscalls/doscalls.def
@@ -1,4 +1,4 @@
-; $Id: doscalls.def,v 1.5 2003/01/07 16:23:11 robd Exp $
+; $Id: doscalls.def,v 1.6 2004/01/31 01:29:11 robertk Exp $
 ;
 ; Def for doscalls.dll - part of the OS/2-sub system
 ; for ReactOS. Provides Access to OS/2 kernel services.
@@ -10,6 +10,17 @@ DESCRIPTION "Part of the ReactOS OS/2 sub system, provides base kernel services
 EXPORTS
 ; FIXME: fill in all exports
 
+<<<<<<< doscalls.def
+DosSleep               
+DosClose                       
+DosOpen                        
+DosRead                        
+DosWrite                       
+DosDevIOCtl            
+DosBeep                
+DosExit                
+DosCreateThread        
+=======
 DosSleep
 Dos32Close
 Dos32Open
@@ -19,5 +30,6 @@ Dos32Write
 DosBeep
 DosExit
 DosCreateThread
+>>>>>>> 1.5
 
 ; EOF