OSDN Git Service
(root)
/
pf3gnuchains
/
sourceware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f1381d
)
Remove conflict indicator from ChangeLog
author
dannysmith
<dannysmith>
Tue, 30 Sep 2003 07:53:10 +0000
(07:53 +0000)
committer
dannysmith
<dannysmith>
Tue, 30 Sep 2003 07:53:10 +0000
(07:53 +0000)
winsup/w32api/ChangeLog
patch
|
blob
|
history
diff --git
a/winsup/w32api/ChangeLog
b/winsup/w32api/ChangeLog
index
48d4a8e
..
436b097
100644
(file)
--- 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,
OSDN Git Service
