projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30a5109
d6fa9e7
)
* Sync up to trunk head (r65074).
author
Amine Khaldi
<amine.khaldi@reactos.org>
Tue, 28 Oct 2014 16:58:25 +0000
(16:58 +0000)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Tue, 28 Oct 2014 16:58:25 +0000
(16:58 +0000)
svn path=/branches/shell-experiments/; revision=65075
61 files changed:
1
2
base/applications/network/net/cmdAccounts.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/cmdHelpMsg.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/cmdLocalGroup.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/cmdStart.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/cmdUser.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/main.c
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/network/net/net.h
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/advapi32/wine/security.c
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/client/file/mntpoint.c
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/kernel32/client/resntfy.c
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/rasdlg/lang/tr-TR.rc
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bus/acpi/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/bus/pcix/fdo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/create.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/dir.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/direntry.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/dirwr.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/fcb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/fastfat/finfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/attrib.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/dirctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/fcb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/mft.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/filesystems/ntfs/ntfs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/ddk/nt_vdd.h
patch
|
diff1
|
diff2
|
blob
|
history
include/reactos/libs/fast486/fast486.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/common.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/common.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/common.inl
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/extraops.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/fast486.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/fpu.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/opcodes.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fast486/opgroups.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/sdk/crt/mem/i386/memchr_asm.s
patch
|
diff1
|
diff2
|
blob
|
history
lib/sdk/crt/mem/i386/memmove_asm.s
patch
|
diff1
|
diff2
|
blob
|
history
lib/sdk/crt/mem/i386/memset_asm.s
patch
|
diff1
|
diff2
|
blob
|
history
lib/sdk/crt/string/i386/tcsnlen.inc
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/se/accesschk.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/bios/vidbios.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/clock.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/cpu/registers.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/dos/dos32krnl/dos.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/emulator.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/emulator.h
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/hardware/keyboard.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/hardware/pic.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/hardware/ps2.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/hardware/vga.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/io.c
patch
|
diff1
|
diff2
|
blob
|
history
subsystems/ntvdm/ntvdm.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/include/gdi32p.h
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/main/dllmain.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/misc/misc.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/clientobj.c
patch
|
|
diff2
|
blob
|
history
win32ss/gdi/gdi32/objects/dc.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/ntgdi/bitmaps.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/gdi/ntgdi/gdiobj.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/desktop.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/msgqueue.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
base/applications/network/net/cmdAccounts.c
Simple merge
diff --cc
base/applications/network/net/cmdHelpMsg.c
Simple merge
diff --cc
base/applications/network/net/cmdLocalGroup.c
Simple merge
diff --cc
base/applications/network/net/cmdStart.c
Simple merge
diff --cc
base/applications/network/net/cmdUser.c
Simple merge
diff --cc
base/applications/network/net/main.c
Simple merge
diff --cc
base/applications/network/net/net.h
Simple merge
diff --cc
dll/win32/advapi32/wine/security.c
Simple merge
diff --cc
dll/win32/kernel32/client/file/mntpoint.c
Simple merge
diff --cc
dll/win32/kernel32/client/resntfy.c
Simple merge
diff --cc
dll/win32/rasdlg/lang/tr-TR.rc
Simple merge
diff --cc
drivers/bus/acpi/main.c
Simple merge
diff --cc
drivers/bus/pcix/fdo.c
Simple merge
diff --cc
drivers/filesystems/fastfat/create.c
Simple merge
diff --cc
drivers/filesystems/fastfat/dir.c
Simple merge
diff --cc
drivers/filesystems/fastfat/direntry.c
Simple merge
diff --cc
drivers/filesystems/fastfat/dirwr.c
Simple merge
diff --cc
drivers/filesystems/fastfat/fcb.c
Simple merge
diff --cc
drivers/filesystems/fastfat/finfo.c
Simple merge
diff --cc
drivers/filesystems/ntfs/attrib.c
Simple merge
diff --cc
drivers/filesystems/ntfs/dirctl.c
Simple merge
diff --cc
drivers/filesystems/ntfs/fcb.c
Simple merge
diff --cc
drivers/filesystems/ntfs/mft.c
Simple merge
diff --cc
drivers/filesystems/ntfs/ntfs.h
Simple merge
diff --cc
include/ddk/nt_vdd.h
Simple merge
diff --cc
include/reactos/libs/fast486/fast486.h
Simple merge
diff --cc
lib/fast486/common.c
Simple merge
diff --cc
lib/fast486/common.h
Simple merge
diff --cc
lib/fast486/common.inl
Simple merge
diff --cc
lib/fast486/extraops.c
Simple merge
diff --cc
lib/fast486/fast486.c
Simple merge
diff --cc
lib/fast486/fpu.c
Simple merge
diff --cc
lib/fast486/opcodes.c
Simple merge
diff --cc
lib/fast486/opgroups.c
Simple merge
diff --cc
lib/sdk/crt/mem/i386/memchr_asm.s
Simple merge
diff --cc
lib/sdk/crt/mem/i386/memmove_asm.s
Simple merge
diff --cc
lib/sdk/crt/mem/i386/memset_asm.s
Simple merge
diff --cc
lib/sdk/crt/string/i386/tcsnlen.inc
Simple merge
diff --cc
ntoskrnl/se/accesschk.c
Simple merge
diff --cc
subsystems/ntvdm/bios/vidbios.c
Simple merge
diff --cc
subsystems/ntvdm/clock.c
Simple merge
diff --cc
subsystems/ntvdm/cpu/registers.c
Simple merge
diff --cc
subsystems/ntvdm/dos/dos32krnl/dos.c
Simple merge
diff --cc
subsystems/ntvdm/emulator.c
Simple merge
diff --cc
subsystems/ntvdm/emulator.h
Simple merge
diff --cc
subsystems/ntvdm/hardware/keyboard.c
Simple merge
diff --cc
subsystems/ntvdm/hardware/pic.c
Simple merge
diff --cc
subsystems/ntvdm/hardware/ps2.c
Simple merge
diff --cc
subsystems/ntvdm/hardware/vga.c
Simple merge
diff --cc
subsystems/ntvdm/io.c
Simple merge
diff --cc
subsystems/ntvdm/ntvdm.c
Simple merge
diff --cc
win32ss/gdi/gdi32/CMakeLists.txt
Simple merge
diff --cc
win32ss/gdi/gdi32/include/gdi32p.h
Simple merge
diff --cc
win32ss/gdi/gdi32/main/dllmain.c
Simple merge
diff --cc
win32ss/gdi/gdi32/misc/misc.c
Simple merge
diff --cc
win32ss/gdi/gdi32/objects/clientobj.c
index 0000000,
e59006f
..
e59006f
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/win32ss/gdi/gdi32/objects/clientobj.c
+++ b/
win32ss/gdi/gdi32/objects/clientobj.c
diff --cc
win32ss/gdi/gdi32/objects/dc.c
Simple merge
diff --cc
win32ss/gdi/ntgdi/bitmaps.c
Simple merge
diff --cc
win32ss/gdi/ntgdi/gdiobj.c
Simple merge
diff --cc
win32ss/user/ntuser/desktop.c
Simple merge
diff --cc
win32ss/user/ntuser/msgqueue.c
Simple merge