From 9cfe36c5ca8aefa0c0bbb5593dad73b49f4d289a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 26 Nov 2014 23:24:26 +0000 Subject: [PATCH] [SHELL] Reapply r65477 (rename explorer-new to explorer). svn path=/trunk/; revision=65500 --- reactos/base/shell/CMakeLists.txt | 2 +- .../shell/{explorer-new => explorer}/CMakeLists.txt | 0 .../base/shell/{explorer-new => explorer}/comcsup.h | 0 .../shell/{explorer-new => explorer}/desktop.cpp | 0 .../shell/{explorer-new => explorer}/dragdrop.cpp | 0 .../shell/{explorer-new => explorer}/explorer.cpp | 0 .../explorer.exe.manifest | 0 .../shell/{explorer-new => explorer}/explorer.rc | 0 .../shell/{explorer-new => explorer}/lang/bg-BG.rc | 0 .../shell/{explorer-new => explorer}/lang/cs-CZ.rc | 0 .../shell/{explorer-new => explorer}/lang/de-DE.rc | 0 .../shell/{explorer-new => explorer}/lang/en-US.rc | 0 .../shell/{explorer-new => explorer}/lang/es-ES.rc | 0 .../shell/{explorer-new => explorer}/lang/fr-FR.rc | 0 .../shell/{explorer-new => explorer}/lang/he-IL.rc | 0 .../shell/{explorer-new => explorer}/lang/it-IT.rc | 0 .../shell/{explorer-new => explorer}/lang/ja-JP.rc | 0 .../shell/{explorer-new => explorer}/lang/ko-KR.rc | 0 .../shell/{explorer-new => explorer}/lang/lt-LT.rc | 0 .../shell/{explorer-new => explorer}/lang/nl-NL.rc | 0 .../shell/{explorer-new => explorer}/lang/no-NO.rc | 0 .../shell/{explorer-new => explorer}/lang/pl-PL.rc | 0 .../shell/{explorer-new => explorer}/lang/pt-BR.rc | 0 .../shell/{explorer-new => explorer}/lang/ro-RO.rc | 0 .../shell/{explorer-new => explorer}/lang/ru-RU.rc | 0 .../shell/{explorer-new => explorer}/lang/sk-SK.rc | 0 .../shell/{explorer-new => explorer}/lang/sq-AL.rc | 0 .../shell/{explorer-new => explorer}/lang/tr-TR.rc | 0 .../shell/{explorer-new => explorer}/lang/uk-UA.rc | 0 .../shell/{explorer-new => explorer}/lang/zh-CN.rc | 0 .../base/shell/{explorer-new => explorer}/precomp.h | 0 .../{explorer-new => explorer}/res/auto_hide.bmp | Bin .../res/lock_group_noql.bmp | Bin .../res/lock_group_ql.bmp | Bin .../res/lock_nogroup_noql.bmp | Bin .../res/lock_nogroup_ql.bmp | Bin .../shell/{explorer-new => explorer}/res/logov.bmp | Bin .../res/nolock_group_noql.bmp | Bin .../res/nolock_group_ql.bmp | Bin .../res/nolock_nogroup_noql.bmp | Bin .../res/nolock_nogroup_ql.bmp | Bin .../shell/{explorer-new => explorer}/res/start.ico | Bin .../shell/{explorer-new => explorer}/resource.h | 0 .../shell/{explorer-new => explorer}/rshell.cpp | 0 .../shell/{explorer-new => explorer}/settings.cpp | 0 .../{explorer-new => explorer}/shellservice.cpp | 0 .../{explorer-new => explorer}/startctxmnu.cpp | 0 .../shell/{explorer-new => explorer}/startmnu.cpp | 0 .../{explorer-new => explorer}/startmnusite.cpp | 0 .../shell/{explorer-new => explorer}/startup.cpp | 0 .../shell/{explorer-new => explorer}/taskband.cpp | 0 .../shell/{explorer-new => explorer}/taskswnd.cpp | 0 .../shell/{explorer-new => explorer}/tbsite.cpp | 0 .../base/shell/{explorer-new => explorer}/todo.h | 0 .../shell/{explorer-new => explorer}/trayntfy.cpp | 0 .../shell/{explorer-new => explorer}/trayprop.cpp | 0 .../shell/{explorer-new => explorer}/traywnd.cpp | 0 .../base/shell/{explorer-new => explorer}/undoc.h | 0 .../base/shell/{explorer-new => explorer}/util.cpp | 0 59 files changed, 1 insertion(+), 1 deletion(-) rename reactos/base/shell/{explorer-new => explorer}/CMakeLists.txt (100%) rename reactos/base/shell/{explorer-new => explorer}/comcsup.h (100%) rename reactos/base/shell/{explorer-new => explorer}/desktop.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/dragdrop.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/explorer.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/explorer.exe.manifest (100%) rename reactos/base/shell/{explorer-new => explorer}/explorer.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/bg-BG.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/cs-CZ.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/de-DE.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/en-US.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/es-ES.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/fr-FR.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/he-IL.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/it-IT.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/ja-JP.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/ko-KR.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/lt-LT.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/nl-NL.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/no-NO.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/pl-PL.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/pt-BR.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/ro-RO.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/ru-RU.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/sk-SK.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/sq-AL.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/tr-TR.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/uk-UA.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/lang/zh-CN.rc (100%) rename reactos/base/shell/{explorer-new => explorer}/precomp.h (100%) rename reactos/base/shell/{explorer-new => explorer}/res/auto_hide.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/lock_group_noql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/lock_group_ql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/lock_nogroup_noql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/lock_nogroup_ql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/logov.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/nolock_group_noql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/nolock_group_ql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/nolock_nogroup_noql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/nolock_nogroup_ql.bmp (100%) rename reactos/base/shell/{explorer-new => explorer}/res/start.ico (100%) rename reactos/base/shell/{explorer-new => explorer}/resource.h (100%) rename reactos/base/shell/{explorer-new => explorer}/rshell.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/settings.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/shellservice.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/startctxmnu.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/startmnu.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/startmnusite.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/startup.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/taskband.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/taskswnd.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/tbsite.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/todo.h (100%) rename reactos/base/shell/{explorer-new => explorer}/trayntfy.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/trayprop.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/traywnd.cpp (100%) rename reactos/base/shell/{explorer-new => explorer}/undoc.h (100%) rename reactos/base/shell/{explorer-new => explorer}/util.cpp (100%) diff --git a/reactos/base/shell/CMakeLists.txt b/reactos/base/shell/CMakeLists.txt index c9b65dff5b3..87e5a37b335 100644 --- 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 -- 2.17.1