projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
47cc151
2fc51b2
)
* Sync up to trunk head (r65120).
author
Amine Khaldi
<amine.khaldi@reactos.org>
Thu, 30 Oct 2014 11:52:53 +0000
(11:52 +0000)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Thu, 30 Oct 2014 11:52:53 +0000
(11:52 +0000)
svn path=/branches/shell-experiments/; revision=65121
21 files changed:
1
2
boot/bootdata/hivedef.inf
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/kernel32.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/winnls/lang/cs-CZ.rc
patch
|
|
diff2
|
blob
|
history
dll/win32/kernel32/winnls/lang/en-US.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/winnls/lang/fr-FR.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/winnls/lang/sq-AL.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/winnls/lang/tr-TR.rc
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/netapi32/user.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/create.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/fsctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/iface.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/fsctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/ntfs.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/volinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/storage/class/disk/disk.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/storage/ide/uniata/id_ata.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drivers/storage/ide/uniata/id_init.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drivers/storage/ide/uniata/uniata_ver.h
patch
|
diff1
|
diff2
|
blob
|
history
media/nls/c_037.nls
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/iomgr/file.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
boot/bootdata/hivedef.inf
Simple merge
diff --cc
dll/win32/kernel32/kernel32.rc
Simple merge
diff --cc
dll/win32/kernel32/winnls/lang/cs-CZ.rc
index 0000000,
cc88926
..
cc88926
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc
+++ b/
dll/win32/kernel32/winnls/lang/cs-CZ.rc
diff --cc
dll/win32/kernel32/winnls/lang/en-US.rc
Simple merge
diff --cc
dll/win32/kernel32/winnls/lang/fr-FR.rc
Simple merge
diff --cc
dll/win32/kernel32/winnls/lang/sq-AL.rc
Simple merge
diff --cc
dll/win32/kernel32/winnls/lang/tr-TR.rc
Simple merge
diff --cc
dll/win32/netapi32/user.c
Simple merge
diff --cc
drivers/filesystems/fastfat/create.c
Simple merge
diff --cc
drivers/filesystems/fastfat/fsctl.c
Simple merge
diff --cc
drivers/filesystems/fastfat/iface.c
Simple merge
diff --cc
drivers/filesystems/fastfat/misc.c
Simple merge
diff --cc
drivers/filesystems/ntfs/fsctl.c
Simple merge
diff --cc
drivers/filesystems/ntfs/ntfs.h
Simple merge
diff --cc
drivers/filesystems/ntfs/volinfo.c
Simple merge
diff --cc
drivers/storage/class/disk/disk.c
Simple merge
diff --cc
drivers/storage/ide/uniata/id_ata.cpp
Simple merge
diff --cc
drivers/storage/ide/uniata/id_init.cpp
Simple merge
diff --cc
drivers/storage/ide/uniata/uniata_ver.h
Simple merge
diff --cc
media/nls/c_037.nls
index
7498213
,
56899dd
..
56899dd
Binary files differ
diff --cc
ntoskrnl/io/iomgr/file.c
Simple merge