Merge remote-tracking branch 'origin/master' into vs2012 42/12242/1
Antoine ELIAS [Thu, 8 Aug 2013 09:25:15 +0000 (11:25 +0200)]
Change-Id: I531efcd7c4b0818b00d891f6430f5afe3b91a652

1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/dynamic_link/macros/detectmsvc64tools.sci
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj

Simple merge
Simple merge
@@@ -34,7 -31,10 +34,9 @@@ function SDKpath = dlwGetSdkPath(
              else
                  SDKpath = [];
              end
+         else
+             errclear();
          end
      end
 -
  endfunction
  //=============================================================================