Ignore:
Timestamp:
2015-07-01 14:52:05 (5 years ago)
Author:
tasalmik
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 2015/27/TapaniS/ProjectStar/ProjectStar/ProjectStar/obj/x86/Debug/ContentPipeline-{F977AF6D-8086-4A71-9FEE-75BE75429D56}.xml

    r6660 r6681  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Kentta.xnb</Output> 
    11       <Time>0001-01-01T00:00:00</Time> 
    12     </Item> 
    13 <<<<<<< .mine 
    14     <Item> 
    15       <Source>monttu.jpg</Source> 
    16       <Name>monttu</Name> 
    17       <Importer>TextureImporter</Importer> 
    18       <Processor>TextureProcessor</Processor> 
    19       <Options>None</Options> 
    20       <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\monttu.xnb</Output> 
    21       <Time>2015-06-30T09:57:38.8415095+03:00</Time> 
     10      <Output>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\Kentta.xnb</Output> 
     11      <Time>2015-06-30T09:54:01.4629095+03:00</Time> 
    2212    </Item> 
    2313    <Item> 
     
    8575    </Item> 
    8676    <BuildSuccessful>true</BuildSuccessful> 
    87 ======= 
    88     <BuildSuccessful>false</BuildSuccessful> 
    89 >>>>>>> .r6658 
    9077    <Settings> 
    9178      <ContentProjectGUID>{F977AF6D-8086-4A71-9FEE-75BE75429D56}</ContentProjectGUID> 
     
    9481      <BuildConfiguration>Debug</BuildConfiguration> 
    9582      <CompressContent>false</CompressContent> 
    96       <RootDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStarContent\</RootDirectory> 
    97       <LoggerRootDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\</LoggerRootDirectory> 
    98       <IntermediateDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\obj\x86\Debug\</IntermediateDirectory> 
    99       <OutputDirectory>C:\Users\Kukkeli\Desktop\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\</OutputDirectory> 
     83      <RootDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStarContent\</RootDirectory> 
     84      <LoggerRootDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\</LoggerRootDirectory> 
     85      <IntermediateDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\obj\x86\Debug\</IntermediateDirectory> 
     86      <OutputDirectory>C:\MyTemp\TapaniS\ProjectStar\ProjectStar\ProjectStar\bin\x86\Debug\Content\</OutputDirectory> 
    10087    </Settings> 
    10188    <Assemblies> 
    10289      <Assembly> 
    10390        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
    104         <Value>2015-06-27T04:27:48+03:00</Value> 
     91        <Value>2014-11-26T00:23:34+02:00</Value> 
    10592      </Assembly> 
    10693      <Assembly> 
     
    130117      <Assembly> 
    131118        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
    132         <Value>2015-06-27T04:27:48+03:00</Value> 
     119        <Value>2014-11-26T00:23:36+02:00</Value> 
    133120      </Assembly> 
    134121      <Assembly> 
    135         <Key>C:\WINDOWS\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
    136         <Value>2015-06-29T11:09:01.1175605+03:00</Value> 
     122        <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key> 
     123        <Value>2014-04-23T00:22:29.3372049+03:00</Value> 
    137124      </Assembly> 
    138125    </Assemblies> 
Note: See TracChangeset for help on using the changeset viewer.