projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eaec85c
ac46205
)
Sync with trunk r62529.
author
David Quintana
<gigaherz@gmail.com>
Tue, 18 Mar 2014 14:39:04 +0000
(14:39 +0000)
committer
David Quintana
<gigaherz@gmail.com>
Tue, 18 Mar 2014 14:39:04 +0000
(14:39 +0000)
svn path=/branches/shell-experiments/; revision=62530
33 files changed:
1
2
base/applications/cmdutils/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/cmdutils/doskey/doskey.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/cmdutils/find/find.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/cmdutils/mode/CMakeLists.txt
patch
|
|
diff2
|
blob
|
history
base/applications/cmdutils/mode/mode.c
patch
|
|
diff2
|
blob
|
history
base/applications/cmdutils/mode/mode.rc
patch
|
|
diff2
|
blob
|
history
base/applications/cmdutils/more/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/cmdutils/more/more.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/applications/cmdutils/xcopy/rsrc.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/es-ES.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/fr-FR.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/hu-HU.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/id-ID.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/it-IT.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/no-NO.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/pl-PL.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/ru-RU.rc
patch
|
diff1
|
diff2
|
blob
|
history
base/shell/cmd/lang/sv-SE.rc
patch
|
diff1
|
diff2
|
blob
|
history
cmake/msvc.cmake
patch
|
diff1
|
diff2
|
blob
|
history
dll/win32/msv1_0/msv1_0.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/i8042prt/pnp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/usbd/usbd.c
patch
|
diff1
|
diff2
|
blob
|
history
ntoskrnl/io/pnpmgr/pnpmgr.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/menu.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/ntuser/window.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/user32/windows/menu.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/condrv/graphics.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/condrv/text.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/frontends/gui/graphics.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/frontends/gui/text.c
patch
|
diff1
|
diff2
|
blob
|
history
win32ss/user/winsrv/consrv/settings.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
base/applications/cmdutils/CMakeLists.txt
Simple merge
diff --cc
base/applications/cmdutils/doskey/doskey.rc
Simple merge
diff --cc
base/applications/cmdutils/find/find.rc
Simple merge
diff --cc
base/applications/cmdutils/mode/CMakeLists.txt
index 0000000,
354c426
..
354c426
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/base/applications/cmdutils/mode/CMakeLists.txt
+++ b/
base/applications/cmdutils/mode/CMakeLists.txt
diff --cc
base/applications/cmdutils/mode/mode.c
index 0000000,
aa49431
..
aa49431
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/base/applications/cmdutils/mode/mode.c
+++ b/
base/applications/cmdutils/mode/mode.c
diff --cc
base/applications/cmdutils/mode/mode.rc
index 0000000,
33c5a85
..
33c5a85
mode 000000,100644..100644
--- /dev/null
---
2
/
reactos/base/applications/cmdutils/mode/mode.rc
+++ b/
base/applications/cmdutils/mode/mode.rc
diff --cc
base/applications/cmdutils/more/CMakeLists.txt
Simple merge
diff --cc
base/applications/cmdutils/more/more.rc
Simple merge
diff --cc
base/applications/cmdutils/xcopy/rsrc.rc
Simple merge
diff --cc
base/shell/cmd/lang/es-ES.rc
Simple merge
diff --cc
base/shell/cmd/lang/fr-FR.rc
Simple merge
diff --cc
base/shell/cmd/lang/hu-HU.rc
Simple merge
diff --cc
base/shell/cmd/lang/id-ID.rc
Simple merge
diff --cc
base/shell/cmd/lang/it-IT.rc
Simple merge
diff --cc
base/shell/cmd/lang/no-NO.rc
Simple merge
diff --cc
base/shell/cmd/lang/pl-PL.rc
Simple merge
diff --cc
base/shell/cmd/lang/ru-RU.rc
Simple merge
diff --cc
base/shell/cmd/lang/sv-SE.rc
Simple merge
diff --cc
cmake/msvc.cmake
Simple merge
diff --cc
dll/win32/msv1_0/msv1_0.c
Simple merge
diff --cc
drivers/input/i8042prt/pnp.c
Simple merge
diff --cc
drivers/usb/usbd/usbd.c
Simple merge
diff --cc
ntoskrnl/io/pnpmgr/pnpmgr.c
Simple merge
diff --cc
win32ss/user/ntuser/menu.c
Simple merge
diff --cc
win32ss/user/ntuser/window.c
Simple merge
diff --cc
win32ss/user/user32/windows/menu.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/condrv/graphics.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/condrv/text.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/frontends/gui/graphics.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
Simple merge
diff --cc
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/frontends/gui/text.c
Simple merge
diff --cc
win32ss/user/winsrv/consrv/settings.c
Simple merge