Merged revision(s) 3073-3074 from SourceForge:

 Correção nas instalações de pacotes.
 Correção no ShellService Delphi.
 Correção nos Wizards.
 Correção de instalação do ZEOS em D7.

Author: mobius1qwe

CORE/Packages/Delphi/Drivers/FireDAC/RESTDWDriverFireDAC.dproj

@@ -44,7 +44,7 @@ requires
   RESTDWCore;
 
 contains
-  uRESTDWShellServices in '..\..\..\Source\ShellTools\Delphi\uRESTDWShellServices.pas';
+  uRESTDWShellServicesDelphi in '..\..\..\Source\ShellTools\uRESTDWShellServicesDelphi.pas';
 
 end.
 

CORE/Packages/Delphi/RESTDWCore.dproj

@@ -42,6 +42,6 @@ requires
   RESTDWShellServices;
 
 contains
-  uRESTDWShellServicesReg in '..\..\..\Source\ShellTools\Delphi\uRESTDWShellServicesReg.pas';
+  uRESTDWShellServicesRegDelphi in '..\..\..\Source\ShellTools\uRESTDWShellServicesRegDelphi.pas';
 
 end.

CORE/Packages/Delphi/RESTDWCore.res

@@ -71,7 +71,7 @@
  monthnames                 : Array [1 .. 12] Of string = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', {do not localize}
                                                            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); {do not localize}
  RESTDWVersionINFO          = 'v2.0.2-';
- RESTDWRelease              = '3065';
+ RESTDWRelease              = '3072';
  RESTDWCodeProject          = 'Savage Reign - GitHub';
  RESTDWVersao               = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
  GOffsetFromUTC             : TDateTime = 0{$IFDEF HAS_DEPRECATED}deprecated{$ENDIF};

CORE/Packages/Delphi/RESTDWCoreDesign.dproj

@@ -138,9 +138,11 @@ interface
 
 implementation
 
-{$IFNDEF FPC}{$if CompilerVersion < 23}
-{$R .\Package\D7\RESTDWDriverZEOS.dcr}
-{$IFEND}{$ENDIF}
+{$IFNDEF FPC}
+ {$if CompilerVersion < 23}
+  {$R .\RESTDWDriverZEOS.dcr}
+ {$IFEND}
+{$ENDIF}
 
 Procedure Register;
 Begin