projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d134425
938600f
)
Sync with trunk head (part 1 of x)
author
Amine Khaldi
<amine.khaldi@reactos.org>
Fri, 26 Mar 2010 09:25:42 +0000
(09:25 +0000)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Fri, 26 Mar 2010 09:25:42 +0000
(09:25 +0000)
svn path=/branches/header-work/; revision=46461
34 files changed:
1
2
ReactOS-amd64.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
base/services/tcpsvcs/tcpsvcs.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/explorer/explorer.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
boot/bootdata/hiveinst_amd64.inf
patch
|
|
diff2
|
blob
|
history
config-amd64.template.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/browseui/internettoolbar.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bus/acpi/busmgr/bus.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bus/acpi/main.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/hal.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/amd64/systimer.S
patch
|
|
diff2
|
blob
|
history
hal/halx86/generic/amd64/x86bios.c
patch
|
|
diff2
|
blob
|
history
hal/halx86/generic/cmos.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/i386/portio.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/i386/systimer.S
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/i386/trap.S
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/spinlock.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/hal_generic.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/hal_generic_mp.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/hal_generic_up.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/halamd64.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/halmps.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/include/halp.h
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/mp/amd64/mps.S
patch
|
|
diff2
|
blob
|
history
hal/halx86/mp/i386/mps.S
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/mp/i386/mpsboot.asm
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/mp/i386/mpsirql.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/up/pic.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/up/processor.c
patch
|
diff1
|
diff2
|
blob
|
history
include/dxsdk/bdatif.idl
patch
|
|
diff2
|
blob
|
history
include/dxsdk/dxsdk.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/config/cmalloc.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/include/internal/cm_x.h
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/po/events.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ReactOS-amd64.rbuild
Simple merge
diff --cc
base/services/tcpsvcs/tcpsvcs.rbuild
Simple merge
diff --cc
base/shell/explorer/explorer.rbuild
Simple merge
diff --cc
boot/bootdata/hiveinst_amd64.inf
index 0000000,
dd7fcdf
..
dd7fcdf
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/boot/bootdata/hiveinst_amd64.inf
+++ b/
boot/bootdata/hiveinst_amd64.inf
diff --cc
config-amd64.template.rbuild
Simple merge
diff --cc
dll/win32/browseui/internettoolbar.cpp
Simple merge
diff --cc
drivers/bus/acpi/busmgr/bus.c
Simple merge
diff --cc
drivers/bus/acpi/main.c
Simple merge
diff --cc
hal/hal.rbuild
Simple merge
diff --cc
hal/halx86/generic/amd64/systimer.S
index 0000000,
1cb3b6e
..
1cb3b6e
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/hal/halx86/generic/amd64/systimer.S
+++ b/
hal/halx86/generic/amd64/systimer.S
diff --cc
hal/halx86/generic/amd64/x86bios.c
index 0000000,
3b43bf1
..
3b43bf1
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/hal/halx86/generic/amd64/x86bios.c
+++ b/
hal/halx86/generic/amd64/x86bios.c
diff --cc
hal/halx86/generic/cmos.c
Simple merge
diff --cc
hal/halx86/generic/i386/portio.c
Simple merge
diff --cc
hal/halx86/generic/i386/systimer.S
Simple merge
diff --cc
hal/halx86/generic/i386/trap.S
Simple merge
diff --cc
hal/halx86/generic/misc.c
Simple merge
diff --cc
hal/halx86/generic/spinlock.c
Simple merge
diff --cc
hal/halx86/hal_generic.rbuild
Simple merge
diff --cc
hal/halx86/hal_generic_mp.rbuild
Simple merge
diff --cc
hal/halx86/hal_generic_up.rbuild
Simple merge
diff --cc
hal/halx86/halamd64.rbuild
Simple merge
diff --cc
hal/halx86/halmps.rbuild
Simple merge
diff --cc
hal/halx86/include/halp.h
Simple merge
diff --cc
hal/halx86/mp/amd64/mps.S
index 0000000,
3543652
..
3543652
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/hal/halx86/mp/amd64/mps.S
+++ b/
hal/halx86/mp/amd64/mps.S
diff --cc
hal/halx86/mp/i386/mps.S
Simple merge
diff --cc
hal/halx86/mp/i386/mpsboot.asm
Simple merge
diff --cc
hal/halx86/mp/i386/mpsirql.c
Simple merge
diff --cc
hal/halx86/up/pic.c
Simple merge
diff --cc
hal/halx86/up/processor.c
Simple merge
diff --cc
include/dxsdk/bdatif.idl
index 0000000,
6c8887e
..
6c8887e
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/include/dxsdk/bdatif.idl
+++ b/
include/dxsdk/bdatif.idl
diff --cc
include/dxsdk/dxsdk.rbuild
Simple merge
diff --cc
ntoskrnl/config/cmalloc.c
Simple merge
diff --cc
ntoskrnl/include/internal/cm_x.h
Simple merge
diff --cc
ntoskrnl/po/events.c
Simple merge