Ignore:
Timestamp:
2017-11-18 14:47:01 (17 months ago)
Author:
mianhayr
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 2016/30/TaavettiV/streetalien2/streetalien2/streetalien2Content/streetalien2Content.contentproj

    r9477 r9479  
    147147    </Compile> 
    148148  </ItemGroup> 
     149<<<<<<< .mine 
     150  <ItemGroup> 
     151    <Compile Include="ketju.png"> 
     152      <Name>ketju</Name> 
     153      <Importer>TextureImporter</Importer> 
     154      <Processor>TextureProcessor</Processor> 
     155    </Compile> 
     156  </ItemGroup> 
     157======= 
    149158  <ItemGroup> 
    150159    <Compile Include="metalli.jpg"> 
     
    154163    </Compile> 
    155164  </ItemGroup> 
     165>>>>>>> .r9478 
    156166  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    157167  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.