Merge branch 'master' of ssh://github.com/hbons/SparkleShare

This commit is contained in:
Hylke Bons 2012-03-17 21:51:18 +00:00
commit b795869914
3 changed files with 4 additions and 3 deletions

View file

@ -112,7 +112,7 @@ namespace SparkleShare {
break;
case default:
default:
string state_text;
if (state == IconState.SyncingUp)

View file

@ -124,7 +124,7 @@ namespace SparkleShare {
break;
case default:
default:
string state_text;
if (state == IconState.SyncingUp)

View file

@ -8,7 +8,8 @@ if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe"
set wixBinDir=%WIX%\bin
copy ..\..\data\icons\sparkleshare.ico ..\..\bin
if not exist ..\..\bin mkdir ..\..\bin
copy ..\..\data\icons\sparkleshare.ico ..\..\bin\
%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="AnyCPU" %~dp0\tools\gettext-cs-utils\Gettext.CsUtils\Core\Gettext.Cs\Gettext.Cs.csproj
%msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" %~dp0\SparkleShare.sln