OSDN Git Service

Merge remote-tracking branch 'egtra/csharp-translation'
authorKimura Youichi <kim.upsilon@bucyou.net>
Tue, 22 Nov 2011 16:02:04 +0000 (01:02 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Wed, 22 Feb 2012 10:28:47 +0000 (19:28 +0900)
Conflicts:
Tween.sln
Tween/ApiInformation.vb
Tween/Tween.Designer.vb
Tween/Tween.resx
Tween/Tween.vbproj
Tween/Win32Api.vb

1  2 
Tween.sln
Tween/Tween.vbproj

diff --cc Tween.sln
+++ b/Tween.sln
@@@ -5,17 -5,10 +5,19 @@@ Project("{F184B08F-C81C-45F6-A57F-5ABD9
  EndProject
  Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TweenUp", "TweenUp\TweenUp.vbproj", "{EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}"
  EndProject
 +Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "TweenSetup", "TweenSetup\TweenSetup.isproj", "{A3D4B9BD-11C5-4655-B068-C00A607DC410}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {41B54F21-5442-47D4-80F0-872D56D9E1FD} = {41B54F21-5442-47D4-80F0-872D56D9E1FD}
 +              {41B54F21-5442-47D4-80F0-872D56D9E1FD} = {41B54F21-5442-47D4-80F0-872D56D9E1FD}
 +      EndProjectSection
 +EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweenCS", "TweenCS\TweenCS.csproj", "{3D8995C7-BDF3-4273-9F9D-DDD902F6A101}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
 +              CD_ROM|Any CPU = CD_ROM|Any CPU
 +              CD_ROM|x64 = CD_ROM|x64
 +              CD_ROM|x86 = CD_ROM|x86
                Debug|Any CPU = Debug|Any CPU
                Debug|x64 = Debug|x64
                Debug|x86 = Debug|x86
                {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.Release|x64.Build.0 = Release|x64
                {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.Release|x86.ActiveCfg = Release|x86
                {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.Release|x86.Build.0 = Release|x86
 +              {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.SingleImage|Any CPU.ActiveCfg = Release|x86
 +              {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.SingleImage|x64.ActiveCfg = Release|x86
 +              {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.SingleImage|x86.ActiveCfg = Release|x86
 +              {EF3CD31B-6669-4932-A0E0-1EA44E4BCE89}.SingleImage|x86.Build.0 = Release|x86
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|Any CPU.ActiveCfg = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|Any CPU.Build.0 = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|x64.ActiveCfg = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|x64.Build.0 = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|x86.ActiveCfg = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.CD_ROM|x86.Build.0 = CD_ROM
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Debug|Any CPU.ActiveCfg = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Debug|Any CPU.Build.0 = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Debug|x64.ActiveCfg = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Debug|x64.Build.0 = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Debug|x86.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|Any CPU.ActiveCfg = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|Any CPU.Build.0 = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|x64.ActiveCfg = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|x64.Build.0 = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|x86.ActiveCfg = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.DVD-5|x86.Build.0 = DVD-5
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Release|Any CPU.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Release|Any CPU.Build.0 = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Release|x64.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Release|x64.Build.0 = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.Release|x86.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|Any CPU.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|Any CPU.Build.0 = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|x64.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|x64.Build.0 = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|x86.ActiveCfg = SingleImage
 +              {A3D4B9BD-11C5-4655-B068-C00A607DC410}.SingleImage|x86.Build.0 = SingleImage
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x64.ActiveCfg = Debug|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x86.ActiveCfg = Debug|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Debug|x86.Build.0 = Debug|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|Any CPU.Build.0 = Release|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x64.ActiveCfg = Release|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x86.ActiveCfg = Release|Any CPU
+               {3D8995C7-BDF3-4273-9F9D-DDD902F6A101}.Release|x86.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
      <Import Include="System.Windows.Forms" />
    </ItemGroup>
    <ItemGroup>
-     <Compile Include="ApiInformation.vb" />
 +    <Compile Include="AdsBrowser.vb">
 +      <SubType>Component</SubType>
 +    </Compile>
      <Compile Include="AppendSettingDialog.Designer.vb">
        <DependentUpon>AppendSettingDialog.vb</DependentUpon>
      </Compile>
      <PostBuildEvent>
      </PostBuildEvent>
    </PropertyGroup>
--</Project>
++</Project>