summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 48d4a8e3b..436b097c6 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -34,7 +34,6 @@
* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
are ANSI/Unicode versions of this function.
->>>>>>> 1.469
2003-09-29 Dimitri Papadopoulos <papadopo@users.sourceforge.net>
* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,