projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c5b7494
f69973e
)
sync with trunk r49322
author
Jérôme Gardou
<jerome.gardou@reactos.org>
Wed, 27 Oct 2010 23:45:28 +0000
(23:45 +0000)
committer
Jérôme Gardou
<jerome.gardou@reactos.org>
Wed, 27 Oct 2010 23:45:28 +0000
(23:45 +0000)
svn path=/branches/cmake-bringup/; revision=49323
12 files changed:
1
2
drivers/storage/classpnp/class.spec
patch
|
|
diff2
|
blob
|
history
include/psdk/basetsd.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/drivers/sound/mmixer/sup.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/drivers/sound/mmixer/topology.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/iomgr/device.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/iomgr/irp.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/mm/ARM3/i386/init.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/mm/amd64/page.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/ntoskrnl.pspec
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/win32/win32k/ntuser/keyboard.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/win32/win32k/ntuser/message.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/win32/win32k/ntuser/monitor.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/storage/classpnp/class.spec
index 0000000,
478f7dc
..
478f7dc
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/drivers/storage/classpnp/class.spec
+++ b/
drivers/storage/classpnp/class.spec
diff --cc
include/psdk/basetsd.h
Simple merge
diff --cc
lib/drivers/sound/mmixer/sup.c
Simple merge
diff --cc
lib/drivers/sound/mmixer/topology.c
Simple merge
diff --cc
ntoskrnl/io/iomgr/device.c
Simple merge
diff --cc
ntoskrnl/io/iomgr/irp.c
Simple merge
diff --cc
ntoskrnl/mm/ARM3/i386/init.c
Simple merge
diff --cc
ntoskrnl/mm/amd64/page.c
Simple merge
diff --cc
ntoskrnl/ntoskrnl.pspec
Simple merge
diff --cc
subsystems/win32/win32k/ntuser/keyboard.c
Simple merge
diff --cc
subsystems/win32/win32k/ntuser/message.c
Simple merge
diff --cc
subsystems/win32/win32k/ntuser/monitor.c
Simple merge