Details
-
Bug
-
Resolution: Cannot Reproduce
-
Trivial
-
None
Description
Fix (diff) unresolved conflicts in r7934 (by robert_kopec).
It looks like intended goal was (mainly) to remove "32" in the function names.
rossubsys/os2/lib/doscalls/doscalls.def
|
13 <<<<<<< doscalls.def
|
rossubsys/os2/lib/doscalls/doscalls.edf
|
13 <<<<<<< doscalls.edf
|
rossubsys/os2/lib/doscalls/file/openclose.cpp
|
23 <<<<<<< openclose.cpp
|