projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8fc9639
9a96133
)
Sync to trunk revision 63922.
author
Hermès Bélusca-Maïto
<hermes.belusca-maito@reactos.org>
Sat, 23 Aug 2014 15:51:37 +0000
(15:51 +0000)
committer
Hermès Bélusca-Maïto
<hermes.belusca-maito@reactos.org>
Sat, 23 Aug 2014 15:51:37 +0000
(15:51 +0000)
svn path=/branches/condrv_restructure/; revision=63923
57 files changed:
1
2
base/applications/rapps/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/explorer/shell/shellfs.cpp
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/explorer/shell/winfs.cpp
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/explorer/shell/winfs.h
patch
|
diff1
|
diff2
|
blob
|
history
boot/bootdata/packages/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
cmake/CMakeMacros.cmake
patch
|
diff1
|
diff2
|
blob
|
history
cmake/gcc.cmake
patch
|
diff1
|
diff2
|
blob
|
history
dll/cpl/appwiz/addons.c
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/defcontextmenu.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/admintools.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/admintools.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/cpanel.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/cpanel.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/desktop.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/desktop.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/fonts.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/fonts.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/fs.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/fs.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/mycomp.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/mycomp.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/mydocuments.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/mydocuments.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/netplaces.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/netplaces.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/printers.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/printers.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/recyclebin.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/folders/recyclebin.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/shell32/shlview.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/npfs/seinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/npfs/waitsup.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/network/ndisuio/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/network/ndisuio/ndisuio.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/network/ndisuio/protocol.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/network/tcpip/tcpip/fileobjs.c
patch
|
diff1
|
diff2
|
blob
|
history
hal/halx86/generic/dma.c
patch
|
diff1
|
diff2
|
blob
|
history
include/crt/ivec.h
patch
|
|
diff2
|
blob
|
history
include/psdk/bthdef.h
patch
|
|
diff2
|
blob
|
history
include/psdk/driverspecs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/psdk/shobjidl.idl
patch
|
diff1
|
diff2
|
blob
|
history
include/psdk/shtypes.idl
patch
|
diff1
|
diff2
|
blob
|
history
include/psdk/stralign.h
patch
|
|
diff2
|
blob
|
history
lib/drivers/ip/transport/rawip/rawip.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/drivers/ip/transport/udp/udp.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/cc/copy.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/cc/fs.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/cc/view.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/config/cmsysini.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/include/internal/cc.h
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/iomgr/device.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/pnpmgr/pnpmgr.c
patch
|
diff1
|
diff2
|
blob
|
history
toolchain-gcc.cmake
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/bitmap.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/utils.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/ntgdi/dibobj.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
base/applications/rapps/misc.c
Simple merge
diff --cc
base/shell/explorer/shell/shellfs.cpp
Simple merge
diff --cc
base/shell/explorer/shell/winfs.cpp
Simple merge
diff --cc
base/shell/explorer/shell/winfs.h
Simple merge
diff --cc
boot/bootdata/packages/CMakeLists.txt
Simple merge
diff --cc
cmake/CMakeMacros.cmake
Simple merge
diff --cc
cmake/gcc.cmake
Simple merge
diff --cc
dll/cpl/appwiz/addons.c
Simple merge
diff --cc
dll/win32/shell32/defcontextmenu.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/admintools.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/admintools.h
Simple merge
diff --cc
dll/win32/shell32/folders/cpanel.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/cpanel.h
Simple merge
diff --cc
dll/win32/shell32/folders/desktop.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/desktop.h
Simple merge
diff --cc
dll/win32/shell32/folders/fonts.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/fonts.h
Simple merge
diff --cc
dll/win32/shell32/folders/fs.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/fs.h
Simple merge
diff --cc
dll/win32/shell32/folders/mycomp.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/mycomp.h
Simple merge
diff --cc
dll/win32/shell32/folders/mydocuments.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/mydocuments.h
Simple merge
diff --cc
dll/win32/shell32/folders/netplaces.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/netplaces.h
Simple merge
diff --cc
dll/win32/shell32/folders/printers.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/printers.h
Simple merge
diff --cc
dll/win32/shell32/folders/recyclebin.cpp
Simple merge
diff --cc
dll/win32/shell32/folders/recyclebin.h
Simple merge
diff --cc
dll/win32/shell32/shlview.cpp
Simple merge
diff --cc
drivers/filesystems/npfs/seinfo.c
Simple merge
diff --cc
drivers/filesystems/npfs/waitsup.c
Simple merge
diff --cc
drivers/network/ndisuio/main.c
Simple merge
diff --cc
drivers/network/ndisuio/ndisuio.h
Simple merge
diff --cc
drivers/network/ndisuio/protocol.c
Simple merge
diff --cc
drivers/network/tcpip/tcpip/fileobjs.c
Simple merge
diff --cc
hal/halx86/generic/dma.c
Simple merge
diff --cc
include/crt/ivec.h
index 0000000,
7d10e03
..
7d10e03
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/include/crt/ivec.h
+++ b/
include/crt/ivec.h
diff --cc
include/psdk/bthdef.h
index 0000000,
d49a60a
..
d49a60a
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/include/psdk/bthdef.h
+++ b/
include/psdk/bthdef.h
diff --cc
include/psdk/driverspecs.h
Simple merge
diff --cc
include/psdk/shobjidl.idl
Simple merge
diff --cc
include/psdk/shtypes.idl
Simple merge
diff --cc
include/psdk/stralign.h
index 0000000,
9b5637d
..
9b5637d
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/include/psdk/stralign.h
+++ b/
include/psdk/stralign.h
diff --cc
lib/drivers/ip/transport/rawip/rawip.c
Simple merge
diff --cc
lib/drivers/ip/transport/udp/udp.c
Simple merge
diff --cc
ntoskrnl/cc/copy.c
Simple merge
diff --cc
ntoskrnl/cc/fs.c
Simple merge
diff --cc
ntoskrnl/cc/view.c
Simple merge
diff --cc
ntoskrnl/config/cmsysini.c
Simple merge
diff --cc
ntoskrnl/include/internal/cc.h
Simple merge
diff --cc
ntoskrnl/io/iomgr/device.c
Simple merge
diff --cc
ntoskrnl/io/pnpmgr/pnpmgr.c
Simple merge
diff --cc
toolchain-gcc.cmake
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/bitmap.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/utils.c
Simple merge
diff --cc
win32ss/gdi/ntgdi/dibobj.c
Simple merge
diff --cc
win32ss/user/ntuser/misc.c
Simple merge