JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict marker.

This commit is contained in:
Andreas Schwab 2009-01-19 09:42:13 +00:00
parent 895d15b81e
commit b50494eedc
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/w32api/ChangeLog
View File

@ -7,7 +7,6 @@
* include/winbase.h (SCS_64BIT_BINARY): Define.
>>>>>>> 1.981
2008-12-05 Chris Sutcliffe <ir0nh34d@users.sf.net>
* include/w32api.h: Increment version to 3.13.