projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e73c9fb
)
[SHELL] Reapply r65477 (rename explorer-new to explorer).
author
Amine Khaldi
<amine.khaldi@reactos.org>
Wed, 26 Nov 2014 23:24:26 +0000
(23:24 +0000)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Wed, 26 Nov 2014 23:24:26 +0000
(23:24 +0000)
svn path=/trunk/; revision=65500
59 files changed:
reactos/base/shell/CMakeLists.txt
patch
|
blob
|
history
reactos/base/shell/explorer/CMakeLists.txt
[moved from
reactos/base/shell/explorer-new/CMakeLists.txt
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/comcsup.h
[moved from
reactos/base/shell/explorer-new/comcsup.h
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/desktop.cpp
[moved from
reactos/base/shell/explorer-new/desktop.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/dragdrop.cpp
[moved from
reactos/base/shell/explorer-new/dragdrop.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/explorer.cpp
[moved from
reactos/base/shell/explorer-new/explorer.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/explorer.exe.manifest
[moved from
reactos/base/shell/explorer-new/explorer.exe.manifest
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/explorer.rc
[moved from
reactos/base/shell/explorer-new/explorer.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/bg-BG.rc
[moved from
reactos/base/shell/explorer-new/lang/bg-BG.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/cs-CZ.rc
[moved from
reactos/base/shell/explorer-new/lang/cs-CZ.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/de-DE.rc
[moved from
reactos/base/shell/explorer-new/lang/de-DE.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/en-US.rc
[moved from
reactos/base/shell/explorer-new/lang/en-US.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/es-ES.rc
[moved from
reactos/base/shell/explorer-new/lang/es-ES.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/fr-FR.rc
[moved from
reactos/base/shell/explorer-new/lang/fr-FR.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/he-IL.rc
[moved from
reactos/base/shell/explorer-new/lang/he-IL.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/it-IT.rc
[moved from
reactos/base/shell/explorer-new/lang/it-IT.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/ja-JP.rc
[moved from
reactos/base/shell/explorer-new/lang/ja-JP.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/ko-KR.rc
[moved from
reactos/base/shell/explorer-new/lang/ko-KR.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/lt-LT.rc
[moved from
reactos/base/shell/explorer-new/lang/lt-LT.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/nl-NL.rc
[moved from
reactos/base/shell/explorer-new/lang/nl-NL.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/no-NO.rc
[moved from
reactos/base/shell/explorer-new/lang/no-NO.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/pl-PL.rc
[moved from
reactos/base/shell/explorer-new/lang/pl-PL.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/pt-BR.rc
[moved from
reactos/base/shell/explorer-new/lang/pt-BR.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/ro-RO.rc
[moved from
reactos/base/shell/explorer-new/lang/ro-RO.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/ru-RU.rc
[moved from
reactos/base/shell/explorer-new/lang/ru-RU.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/sk-SK.rc
[moved from
reactos/base/shell/explorer-new/lang/sk-SK.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/sq-AL.rc
[moved from
reactos/base/shell/explorer-new/lang/sq-AL.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/tr-TR.rc
[moved from
reactos/base/shell/explorer-new/lang/tr-TR.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/uk-UA.rc
[moved from
reactos/base/shell/explorer-new/lang/uk-UA.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/lang/zh-CN.rc
[moved from
reactos/base/shell/explorer-new/lang/zh-CN.rc
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/precomp.h
[moved from
reactos/base/shell/explorer-new/precomp.h
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/auto_hide.bmp
[moved from
reactos/base/shell/explorer-new/res/auto_hide.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/lock_group_noql.bmp
[moved from
reactos/base/shell/explorer-new/res/lock_group_noql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/lock_group_ql.bmp
[moved from
reactos/base/shell/explorer-new/res/lock_group_ql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/lock_nogroup_noql.bmp
[moved from
reactos/base/shell/explorer-new/res/lock_nogroup_noql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/lock_nogroup_ql.bmp
[moved from
reactos/base/shell/explorer-new/res/lock_nogroup_ql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/logov.bmp
[moved from
reactos/base/shell/explorer-new/res/logov.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/nolock_group_noql.bmp
[moved from
reactos/base/shell/explorer-new/res/nolock_group_noql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/nolock_group_ql.bmp
[moved from
reactos/base/shell/explorer-new/res/nolock_group_ql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/nolock_nogroup_noql.bmp
[moved from
reactos/base/shell/explorer-new/res/nolock_nogroup_noql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/nolock_nogroup_ql.bmp
[moved from
reactos/base/shell/explorer-new/res/nolock_nogroup_ql.bmp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/res/start.ico
[moved from
reactos/base/shell/explorer-new/res/start.ico
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/resource.h
[moved from
reactos/base/shell/explorer-new/resource.h
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/rshell.cpp
[moved from
reactos/base/shell/explorer-new/rshell.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/settings.cpp
[moved from
reactos/base/shell/explorer-new/settings.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/shellservice.cpp
[moved from
reactos/base/shell/explorer-new/shellservice.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/startctxmnu.cpp
[moved from
reactos/base/shell/explorer-new/startctxmnu.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/startmnu.cpp
[moved from
reactos/base/shell/explorer-new/startmnu.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/startmnusite.cpp
[moved from
reactos/base/shell/explorer-new/startmnusite.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/startup.cpp
[moved from
reactos/base/shell/explorer-new/startup.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/taskband.cpp
[moved from
reactos/base/shell/explorer-new/taskband.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/taskswnd.cpp
[moved from
reactos/base/shell/explorer-new/taskswnd.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/tbsite.cpp
[moved from
reactos/base/shell/explorer-new/tbsite.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/todo.h
[moved from
reactos/base/shell/explorer-new/todo.h
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/trayntfy.cpp
[moved from
reactos/base/shell/explorer-new/trayntfy.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/trayprop.cpp
[moved from
reactos/base/shell/explorer-new/trayprop.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/traywnd.cpp
[moved from
reactos/base/shell/explorer-new/traywnd.cpp
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/undoc.h
[moved from
reactos/base/shell/explorer-new/undoc.h
with 100% similarity]
patch
|
blob
|
history
reactos/base/shell/explorer/util.cpp
[moved from
reactos/base/shell/explorer-new/util.cpp
with 100% similarity]
patch
|
blob
|
history
diff --git
a/reactos/base/shell/CMakeLists.txt
b/reactos/base/shell/CMakeLists.txt
index
c9b65df
..
87e5a37
100644
(file)
--- a/
reactos/base/shell/CMakeLists.txt
+++ b/
reactos/base/shell/CMakeLists.txt
@@
-1,6
+1,6
@@
add_subdirectory(cmd)
+add_subdirectory(explorer)
add_subdirectory(explorer-old)
-add_subdirectory(explorer-new)
add_subdirectory(filebrowser)
add_subdirectory(rshell)
diff --git
a/reactos/base/shell/explorer-new/CMakeLists.txt
b/reactos/base/shell/explorer/CMakeLists.txt
similarity index 100%
rename from
reactos/base/shell/explorer-new/CMakeLists.txt
rename to
reactos/base/shell/explorer/CMakeLists.txt
diff --git
a/reactos/base/shell/explorer-new/comcsup.h
b/reactos/base/shell/explorer/comcsup.h
similarity index 100%
rename from
reactos/base/shell/explorer-new/comcsup.h
rename to
reactos/base/shell/explorer/comcsup.h
diff --git
a/reactos/base/shell/explorer-new/desktop.cpp
b/reactos/base/shell/explorer/desktop.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/desktop.cpp
rename to
reactos/base/shell/explorer/desktop.cpp
diff --git
a/reactos/base/shell/explorer-new/dragdrop.cpp
b/reactos/base/shell/explorer/dragdrop.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/dragdrop.cpp
rename to
reactos/base/shell/explorer/dragdrop.cpp
diff --git
a/reactos/base/shell/explorer-new/explorer.cpp
b/reactos/base/shell/explorer/explorer.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/explorer.cpp
rename to
reactos/base/shell/explorer/explorer.cpp
diff --git
a/reactos/base/shell/explorer-new/explorer.exe.manifest
b/reactos/base/shell/explorer/explorer.exe.manifest
similarity index 100%
rename from
reactos/base/shell/explorer-new/explorer.exe.manifest
rename to
reactos/base/shell/explorer/explorer.exe.manifest
diff --git
a/reactos/base/shell/explorer-new/explorer.rc
b/reactos/base/shell/explorer/explorer.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/explorer.rc
rename to
reactos/base/shell/explorer/explorer.rc
diff --git
a/reactos/base/shell/explorer-new/lang/bg-BG.rc
b/reactos/base/shell/explorer/lang/bg-BG.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/bg-BG.rc
rename to
reactos/base/shell/explorer/lang/bg-BG.rc
diff --git
a/reactos/base/shell/explorer-new/lang/cs-CZ.rc
b/reactos/base/shell/explorer/lang/cs-CZ.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/cs-CZ.rc
rename to
reactos/base/shell/explorer/lang/cs-CZ.rc
diff --git
a/reactos/base/shell/explorer-new/lang/de-DE.rc
b/reactos/base/shell/explorer/lang/de-DE.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/de-DE.rc
rename to
reactos/base/shell/explorer/lang/de-DE.rc
diff --git
a/reactos/base/shell/explorer-new/lang/en-US.rc
b/reactos/base/shell/explorer/lang/en-US.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/en-US.rc
rename to
reactos/base/shell/explorer/lang/en-US.rc
diff --git
a/reactos/base/shell/explorer-new/lang/es-ES.rc
b/reactos/base/shell/explorer/lang/es-ES.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/es-ES.rc
rename to
reactos/base/shell/explorer/lang/es-ES.rc
diff --git
a/reactos/base/shell/explorer-new/lang/fr-FR.rc
b/reactos/base/shell/explorer/lang/fr-FR.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/fr-FR.rc
rename to
reactos/base/shell/explorer/lang/fr-FR.rc
diff --git
a/reactos/base/shell/explorer-new/lang/he-IL.rc
b/reactos/base/shell/explorer/lang/he-IL.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/he-IL.rc
rename to
reactos/base/shell/explorer/lang/he-IL.rc
diff --git
a/reactos/base/shell/explorer-new/lang/it-IT.rc
b/reactos/base/shell/explorer/lang/it-IT.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/it-IT.rc
rename to
reactos/base/shell/explorer/lang/it-IT.rc
diff --git
a/reactos/base/shell/explorer-new/lang/ja-JP.rc
b/reactos/base/shell/explorer/lang/ja-JP.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/ja-JP.rc
rename to
reactos/base/shell/explorer/lang/ja-JP.rc
diff --git
a/reactos/base/shell/explorer-new/lang/ko-KR.rc
b/reactos/base/shell/explorer/lang/ko-KR.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/ko-KR.rc
rename to
reactos/base/shell/explorer/lang/ko-KR.rc
diff --git
a/reactos/base/shell/explorer-new/lang/lt-LT.rc
b/reactos/base/shell/explorer/lang/lt-LT.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/lt-LT.rc
rename to
reactos/base/shell/explorer/lang/lt-LT.rc
diff --git
a/reactos/base/shell/explorer-new/lang/nl-NL.rc
b/reactos/base/shell/explorer/lang/nl-NL.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/nl-NL.rc
rename to
reactos/base/shell/explorer/lang/nl-NL.rc
diff --git
a/reactos/base/shell/explorer-new/lang/no-NO.rc
b/reactos/base/shell/explorer/lang/no-NO.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/no-NO.rc
rename to
reactos/base/shell/explorer/lang/no-NO.rc
diff --git
a/reactos/base/shell/explorer-new/lang/pl-PL.rc
b/reactos/base/shell/explorer/lang/pl-PL.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/pl-PL.rc
rename to
reactos/base/shell/explorer/lang/pl-PL.rc
diff --git
a/reactos/base/shell/explorer-new/lang/pt-BR.rc
b/reactos/base/shell/explorer/lang/pt-BR.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/pt-BR.rc
rename to
reactos/base/shell/explorer/lang/pt-BR.rc
diff --git
a/reactos/base/shell/explorer-new/lang/ro-RO.rc
b/reactos/base/shell/explorer/lang/ro-RO.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/ro-RO.rc
rename to
reactos/base/shell/explorer/lang/ro-RO.rc
diff --git
a/reactos/base/shell/explorer-new/lang/ru-RU.rc
b/reactos/base/shell/explorer/lang/ru-RU.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/ru-RU.rc
rename to
reactos/base/shell/explorer/lang/ru-RU.rc
diff --git
a/reactos/base/shell/explorer-new/lang/sk-SK.rc
b/reactos/base/shell/explorer/lang/sk-SK.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/sk-SK.rc
rename to
reactos/base/shell/explorer/lang/sk-SK.rc
diff --git
a/reactos/base/shell/explorer-new/lang/sq-AL.rc
b/reactos/base/shell/explorer/lang/sq-AL.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/sq-AL.rc
rename to
reactos/base/shell/explorer/lang/sq-AL.rc
diff --git
a/reactos/base/shell/explorer-new/lang/tr-TR.rc
b/reactos/base/shell/explorer/lang/tr-TR.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/tr-TR.rc
rename to
reactos/base/shell/explorer/lang/tr-TR.rc
diff --git
a/reactos/base/shell/explorer-new/lang/uk-UA.rc
b/reactos/base/shell/explorer/lang/uk-UA.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/uk-UA.rc
rename to
reactos/base/shell/explorer/lang/uk-UA.rc
diff --git
a/reactos/base/shell/explorer-new/lang/zh-CN.rc
b/reactos/base/shell/explorer/lang/zh-CN.rc
similarity index 100%
rename from
reactos/base/shell/explorer-new/lang/zh-CN.rc
rename to
reactos/base/shell/explorer/lang/zh-CN.rc
diff --git
a/reactos/base/shell/explorer-new/precomp.h
b/reactos/base/shell/explorer/precomp.h
similarity index 100%
rename from
reactos/base/shell/explorer-new/precomp.h
rename to
reactos/base/shell/explorer/precomp.h
diff --git
a/reactos/base/shell/explorer-new/res/auto_hide.bmp
b/reactos/base/shell/explorer/res/auto_hide.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/auto_hide.bmp
rename to
reactos/base/shell/explorer/res/auto_hide.bmp
diff --git
a/reactos/base/shell/explorer-new/res/lock_group_noql.bmp
b/reactos/base/shell/explorer/res/lock_group_noql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/lock_group_noql.bmp
rename to
reactos/base/shell/explorer/res/lock_group_noql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/lock_group_ql.bmp
b/reactos/base/shell/explorer/res/lock_group_ql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/lock_group_ql.bmp
rename to
reactos/base/shell/explorer/res/lock_group_ql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/lock_nogroup_noql.bmp
b/reactos/base/shell/explorer/res/lock_nogroup_noql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/lock_nogroup_noql.bmp
rename to
reactos/base/shell/explorer/res/lock_nogroup_noql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/lock_nogroup_ql.bmp
b/reactos/base/shell/explorer/res/lock_nogroup_ql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/lock_nogroup_ql.bmp
rename to
reactos/base/shell/explorer/res/lock_nogroup_ql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/logov.bmp
b/reactos/base/shell/explorer/res/logov.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/logov.bmp
rename to
reactos/base/shell/explorer/res/logov.bmp
diff --git
a/reactos/base/shell/explorer-new/res/nolock_group_noql.bmp
b/reactos/base/shell/explorer/res/nolock_group_noql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/nolock_group_noql.bmp
rename to
reactos/base/shell/explorer/res/nolock_group_noql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/nolock_group_ql.bmp
b/reactos/base/shell/explorer/res/nolock_group_ql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/nolock_group_ql.bmp
rename to
reactos/base/shell/explorer/res/nolock_group_ql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/nolock_nogroup_noql.bmp
b/reactos/base/shell/explorer/res/nolock_nogroup_noql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/nolock_nogroup_noql.bmp
rename to
reactos/base/shell/explorer/res/nolock_nogroup_noql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/nolock_nogroup_ql.bmp
b/reactos/base/shell/explorer/res/nolock_nogroup_ql.bmp
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/nolock_nogroup_ql.bmp
rename to
reactos/base/shell/explorer/res/nolock_nogroup_ql.bmp
diff --git
a/reactos/base/shell/explorer-new/res/start.ico
b/reactos/base/shell/explorer/res/start.ico
similarity index 100%
rename from
reactos/base/shell/explorer-new/res/start.ico
rename to
reactos/base/shell/explorer/res/start.ico
diff --git
a/reactos/base/shell/explorer-new/resource.h
b/reactos/base/shell/explorer/resource.h
similarity index 100%
rename from
reactos/base/shell/explorer-new/resource.h
rename to
reactos/base/shell/explorer/resource.h
diff --git
a/reactos/base/shell/explorer-new/rshell.cpp
b/reactos/base/shell/explorer/rshell.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/rshell.cpp
rename to
reactos/base/shell/explorer/rshell.cpp
diff --git
a/reactos/base/shell/explorer-new/settings.cpp
b/reactos/base/shell/explorer/settings.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/settings.cpp
rename to
reactos/base/shell/explorer/settings.cpp
diff --git
a/reactos/base/shell/explorer-new/shellservice.cpp
b/reactos/base/shell/explorer/shellservice.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/shellservice.cpp
rename to
reactos/base/shell/explorer/shellservice.cpp
diff --git
a/reactos/base/shell/explorer-new/startctxmnu.cpp
b/reactos/base/shell/explorer/startctxmnu.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/startctxmnu.cpp
rename to
reactos/base/shell/explorer/startctxmnu.cpp
diff --git
a/reactos/base/shell/explorer-new/startmnu.cpp
b/reactos/base/shell/explorer/startmnu.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/startmnu.cpp
rename to
reactos/base/shell/explorer/startmnu.cpp
diff --git
a/reactos/base/shell/explorer-new/startmnusite.cpp
b/reactos/base/shell/explorer/startmnusite.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/startmnusite.cpp
rename to
reactos/base/shell/explorer/startmnusite.cpp
diff --git
a/reactos/base/shell/explorer-new/startup.cpp
b/reactos/base/shell/explorer/startup.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/startup.cpp
rename to
reactos/base/shell/explorer/startup.cpp
diff --git
a/reactos/base/shell/explorer-new/taskband.cpp
b/reactos/base/shell/explorer/taskband.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/taskband.cpp
rename to
reactos/base/shell/explorer/taskband.cpp
diff --git
a/reactos/base/shell/explorer-new/taskswnd.cpp
b/reactos/base/shell/explorer/taskswnd.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/taskswnd.cpp
rename to
reactos/base/shell/explorer/taskswnd.cpp
diff --git
a/reactos/base/shell/explorer-new/tbsite.cpp
b/reactos/base/shell/explorer/tbsite.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/tbsite.cpp
rename to
reactos/base/shell/explorer/tbsite.cpp
diff --git
a/reactos/base/shell/explorer-new/todo.h
b/reactos/base/shell/explorer/todo.h
similarity index 100%
rename from
reactos/base/shell/explorer-new/todo.h
rename to
reactos/base/shell/explorer/todo.h
diff --git
a/reactos/base/shell/explorer-new/trayntfy.cpp
b/reactos/base/shell/explorer/trayntfy.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/trayntfy.cpp
rename to
reactos/base/shell/explorer/trayntfy.cpp
diff --git
a/reactos/base/shell/explorer-new/trayprop.cpp
b/reactos/base/shell/explorer/trayprop.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/trayprop.cpp
rename to
reactos/base/shell/explorer/trayprop.cpp
diff --git
a/reactos/base/shell/explorer-new/traywnd.cpp
b/reactos/base/shell/explorer/traywnd.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/traywnd.cpp
rename to
reactos/base/shell/explorer/traywnd.cpp
diff --git
a/reactos/base/shell/explorer-new/undoc.h
b/reactos/base/shell/explorer/undoc.h
similarity index 100%
rename from
reactos/base/shell/explorer-new/undoc.h
rename to
reactos/base/shell/explorer/undoc.h
diff --git
a/reactos/base/shell/explorer-new/util.cpp
b/reactos/base/shell/explorer/util.cpp
similarity index 100%
rename from
reactos/base/shell/explorer-new/util.cpp
rename to
reactos/base/shell/explorer/util.cpp