Changeset 5266 for 2014/27


Ignore:
Timestamp:
2014-07-02 10:26:16 (5 years ago)
Author:
mijoilmo
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml

    r5264 r5266  
    99      <Options>None</Options> 
    1010      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb</Output> 
    11       <Time>2014-07-01T12:29:06.4651495+03:00</Time> 
     11      <Time>0001-01-01T00:00:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
     19      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 
    1920<<<<<<< .mine 
    20       <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 
     21      <Time>0001-01-01T00:00:00</Time> 
     22======= 
    2123      <Time>2014-07-01T13:37:51.5196654+03:00</Time> 
    2224======= 
     
    2426      <Time>2014-07-02T09:56:28.5035703+03:00</Time> 
    2527>>>>>>> .r5260 
     28>>>>>>> .r5264 
    2629    </Item> 
    2730    <Item> 
     
    3235      <Options>None</Options> 
    3336      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb</Output> 
    34       <Time>2014-07-01T13:39:05.8200947+03:00</Time> 
     37      <Time>0001-01-01T00:00:00</Time> 
    3538    </Item> 
     39<<<<<<< .mine 
     40    <BuildSuccessful>false</BuildSuccessful> 
     41======= 
    3642<<<<<<< .mine 
    3743    <Item> 
     
    95101>>>>>>> .r5262 
    96102    <BuildSuccessful>true</BuildSuccessful> 
     103>>>>>>> .r5264 
    97104    <Settings> 
    98105      <ContentProjectGUID>{5156C658-EF8C-4216-BA6D-9928D133FE72}</ContentProjectGUID> 
Note: See TracChangeset for help on using the changeset viewer.