projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eaa1cb5
a9b1042
)
Sync with trunk (r48144)
author
Jérôme Gardou
<jerome.gardou@reactos.org>
Tue, 20 Jul 2010 22:15:42 +0000
(22:15 +0000)
committer
Jérôme Gardou
<jerome.gardou@reactos.org>
Tue, 20 Jul 2010 22:15:42 +0000
(22:15 +0000)
svn path=/branches/reactos-yarotows/; revision=48150
32 files changed:
1
2
base/applications/mscutils/eventvwr/lang/en-US.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/de-DE.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/ja-JP.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/ru-RU.rc
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/bootsect/ext2.asm
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/bootsect/fat.asm
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/bootsect/fat32.asm
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/bootsect/isoboot.asm
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/bootsect/isobtrt.asm
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/freeldr/freeldr.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
boot/freeldr/freeldr/freeldr_amd64.lnk
patch
|
|
diff2
|
blob
|
history
boot/freeldr/freeldr/freeldr_i386.lnk
patch
|
|
diff2
|
blob
|
history
boot/freeldr/freeldr/setupldr.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
dll/cpl/access/resource.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/cpl/intl/lang/ro-RO.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/cpl/sysdm/lang/ro-RO.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/devmgr/lang/ro-RO.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/msgina/lang/ro-RO.rc
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bus/acpi/acpi.rbuild
patch
|
diff1
|
diff2
|
blob
|
history
include/psdk/rpcndr.h
patch
|
diff1
|
diff2
|
blob
|
history
include/psdk/sdkddkver.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/mingw-w64/sect_attribs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/wine/commctrl.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/wine/ddk/compstui.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/wine/ddk/winddiui.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/wine/ddk/winsplp.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/3rdparty/mingw/CRT_fp10.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/3rdparty/mingw/CRT_fp8.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/3rdparty/mingw/crtexe.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/3rdparty/mingw/gs_support.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/3rdparty/mingw/tlssup.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/ntoskrnl_amd64.lnk
patch
|
|
diff2
|
blob
|
history
diff --cc
base/applications/mscutils/eventvwr/lang/en-US.rc
Simple merge
diff --cc
base/shell/cmd/lang/de-DE.rc
Simple merge
diff --cc
base/shell/cmd/lang/ja-JP.rc
Simple merge
diff --cc
base/shell/cmd/lang/ru-RU.rc
Simple merge
diff --cc
boot/freeldr/bootsect/ext2.asm
Simple merge
diff --cc
boot/freeldr/bootsect/fat.asm
Simple merge
diff --cc
boot/freeldr/bootsect/fat32.asm
Simple merge
diff --cc
boot/freeldr/bootsect/isoboot.asm
Simple merge
diff --cc
boot/freeldr/bootsect/isobtrt.asm
Simple merge
diff --cc
boot/freeldr/freeldr/freeldr.rbuild
Simple merge
diff --cc
boot/freeldr/freeldr/freeldr_amd64.lnk
index 0000000,
bb677e8
..
bb677e8
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/boot/freeldr/freeldr/freeldr_amd64.lnk
+++ b/
boot/freeldr/freeldr/freeldr_amd64.lnk
diff --cc
boot/freeldr/freeldr/freeldr_i386.lnk
index 0000000,
48b7b5d
..
48b7b5d
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/boot/freeldr/freeldr/freeldr_i386.lnk
+++ b/
boot/freeldr/freeldr/freeldr_i386.lnk
diff --cc
boot/freeldr/freeldr/setupldr.rbuild
Simple merge
diff --cc
dll/cpl/access/resource.h
Simple merge
diff --cc
dll/cpl/intl/lang/ro-RO.rc
Simple merge
diff --cc
dll/cpl/sysdm/lang/ro-RO.rc
Simple merge
diff --cc
dll/win32/devmgr/lang/ro-RO.rc
Simple merge
diff --cc
dll/win32/msgina/lang/ro-RO.rc
Simple merge
diff --cc
drivers/bus/acpi/acpi.rbuild
Simple merge
diff --cc
include/psdk/rpcndr.h
Simple merge
diff --cc
include/psdk/sdkddkver.h
Simple merge
diff --cc
include/reactos/mingw-w64/sect_attribs.h
Simple merge
diff --cc
include/reactos/wine/commctrl.h
Simple merge
diff --cc
include/reactos/wine/ddk/compstui.h
Simple merge
diff --cc
include/reactos/wine/ddk/winddiui.h
Simple merge
diff --cc
include/reactos/wine/ddk/winsplp.h
Simple merge
diff --cc
lib/3rdparty/mingw/CRT_fp10.c
Simple merge
diff --cc
lib/3rdparty/mingw/CRT_fp8.c
Simple merge
diff --cc
lib/3rdparty/mingw/crtexe.c
Simple merge
diff --cc
lib/3rdparty/mingw/gs_support.c
Simple merge
diff --cc
lib/3rdparty/mingw/tlssup.c
Simple merge
diff --cc
ntoskrnl/ntoskrnl_amd64.lnk
index 0000000,
c8ea8e4
..
c8ea8e4
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/ntoskrnl/ntoskrnl_amd64.lnk
+++ b/
ntoskrnl/ntoskrnl_amd64.lnk