• R/O
  • HTTP
  • SSH
  • HTTPS

handbrake-jp: Commit

handbrake-jp project\'s main repository.


Commit MetaInfo

Revisiónade660813b9d39c77a25face7a5b418be3fd26c9 (tree)
Tiempo2011-01-04 21:28:01
Autorunknown <hirom@.(no...>
Commiterhylom

Log Message

fix some merge error

Cambiar Resumen

Diferencia

--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -3,7 +3,7 @@
33 <PropertyGroup>
44 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6- <ProductVersion>9.0.21022</ProductVersion>
6+ <ProductVersion>9.0.30729</ProductVersion>
77 <SchemaVersion>2.0</SchemaVersion>
88 <ProjectGuid>{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}</ProjectGuid>
99 <OutputType>WinExe</OutputType>
@@ -21,7 +21,7 @@
2121 <OldToolsVersion>3.5</OldToolsVersion>
2222 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
2323 <IsWebBootstrapper>false</IsWebBootstrapper>
24- <SignManifests>true</SignManifests>
24+ <SignManifests>false</SignManifests>
2525 <TargetFrameworkSubset>
2626 </TargetFrameworkSubset>
2727 <ManifestCertificateThumbprint>951B5E0B0DA7DC7D66E1AE6C0B40C5932766882D</ManifestCertificateThumbprint>
@@ -373,11 +373,7 @@
373373 </ItemGroup>
374374 <ItemGroup>
375375 <Content Include="handbrakepineapple.ico" />
376-<<<<<<< HEAD
377376 <None Include="Properties\AssemblyInfo.cs.tmpl" />
378-=======
379- <None Include="HandBrakeCS_TemporaryKey.pfx" />
380->>>>>>> import jp-0.9.3
381377 <None Include="Resources\logo64.png" />
382378 <None Include="Resources\logo128.png" />
383379 <None Include="Resources\ActivityWindow.png" />
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -158,7 +158,7 @@ namespace Handbrake
158158 this.btn_pause.Name = "btn_pause";
159159 this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
160160 this.btn_pause.Size = new System.Drawing.Size(74, 36);
161- this.btn_stop.Text = "一時停止";
161+ this.btn_pause.Text = "一時停止";
162162 this.btn_pause.Visible = false;
163163 this.btn_pause.Click += new System.EventHandler(this.BtnPauseClick);
164164 //
Show on old repository browser