Pokaż
Ignoruj:
Data:
2009-12-08 10:09:39 (16 years ago)
Autor:
sylwek
Opis:

re #195 - merged with latest trunk

Lokalizacja:
branches/Emisje
Pliki:
3 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Emisje

    • Property svn:mergeinfo

      •  

        old new  
        33/branches/ReklamaReorganizacja:568-731 
        44/tags/BazaReklam_1.1.28:831 
        5 /trunk:774-893 
         5/trunk:774-893,896-936 

  • branches/Emisje/eCard/eCardMVC/Platnosci.Tests

    • Włąściwość: svn:ignore set to
      bin

  • branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj

    r895 r939  
    3232  </PropertyGroup> 
    3333  <ItemGroup> 
     34    <Reference Include="Interop.SHDocVw, Version=1.1.0.0, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=MSIL"> 
     35      <SpecificVersion>False</SpecificVersion> 
     36      <HintPath>..\lib\Interop.SHDocVw.dll</HintPath> 
     37    </Reference> 
    3438    <Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL"> 
    3539      <SpecificVersion>False</SpecificVersion> 
    36       <HintPath>..\..\..\..\Documents and Settings\Administrator\Pulpit\Moq.4.0.812.4-bin\Moq.dll</HintPath> 
     40      <HintPath>..\lib\Moq.dll</HintPath> 
    3741    </Reference> 
    3842    <Reference Include="MvcContrib, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL"> 
    … …  
    7478    <Reference Include="WatiN.Core, Version=2.0.10.928, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=x86"> 
    7579      <SpecificVersion>False</SpecificVersion> 
    76       <HintPath>..\..\..\..\Documents and Settings\Administrator\Pulpit\WatiN-2.0.10.928-net-2.0\bin\WatiN.Core.dll</HintPath> 
     80      <HintPath>..\lib\WatiN.Core.dll</HintPath> 
    7781    </Reference> 
    7882  </ItemGroup> 
    7983  <ItemGroup> 
    8084    <Compile Include="Properties\AssemblyInfo.cs" /> 
     85    <Compile Include="TestRunner.cs" /> 
     86    <Compile Include="Web\MerchantControllerTests.cs" /> 
    8187    <Compile Include="Web\FakeDataContext.cs" /> 
     88    <Compile Include="Web\FakeTranslation.cs" /> 
    8289    <Compile Include="Web\Function.cs" /> 
    8390    <Compile Include="Web\PlatnosciControllerTests.cs" /> 
     91    <Compile Include="Web\StatusTest.cs" /> 
    8492    <Compile Include="Web\TestMethods.cs" /> 
    8593    <Compile Include="Web\UIAccountTest.cs" />