OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict indicator. 

From-SVN: r50893
This commit is contained in:
Bryce McKinlay 2002-03-16 21:04:28 +00:00
parent 3bb6567285
commit c2765075db
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libjava/ChangeLog
View File

@ -106,7 +106,6 @@
* java/lang/natObject.cc: Move thread synchronization primitives to
system-dependent headers.
>>>>>>> 1.1231
2002-03-09 Adam Megacz <adam@xwt.org>
* java/io/natFileDescriptorWin32.cc (read): Return -1 if zero