neu

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

diff --git a/os2/lib/doscalls/doscalls.edf b/os2/lib/doscalls/doscalls.edf
index 1e59fcf..1288f6f 100644 (file)
--- a/os2/lib/doscalls/doscalls.edf
+++ b/os2/lib/doscalls/doscalls.edf
@@ -1,4 +1,4 @@
-; $Id: doscalls.edf,v 1.3 2003/01/07 16:23:11 robd Exp $
+; $Id: doscalls.edf,v 1.4 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.edf
+DosSleep=DosSleep
+DosClose=DosClose
+DosOpen=DosOpen
+DosRead=DosRead
+DosWrite=DosWrite
+DosDevIOCtl=DosDevIOCtl
+DosBeep=DosBeep
+DosExit=DosExit
+DosCreateThread=DosCreateThread
+=======
 DosSleep=DosSleep@4                     @229
 Dos32Close=Dos32Close@4                 @257
 Dos32Open=Dos32Open@32                  @273
@@ -19,5 +30,6 @@ Dos32Write=Dos32Write@16                @282
 DosBeep=DosBeep@8                       @286
 DosExit=DosExit@8                       @234
 DosCreateThread=DosCreateThread@20      @311
+>>>>>>> 1.3
 
 ; EOF