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

Remove conflict indicator from ChangeLog

Browse Source
This commit is contained in:
Danny Smith 2003-09-30 07:53:10 +00:00
parent 4d36c543ea
commit fe5fb62c09
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/w32api/ChangeLog
View File

@ -34,7 +34,6 @@
* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there * lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
are ANSI/Unicode versions of this function. are ANSI/Unicode versions of this function.
>>>>>>> 1.469
2003-09-29 Dimitri Papadopoulos <papadopo@users.sourceforge.net> 2003-09-29 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE, * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,