Changeset 5266

Timestamp:

2014-07-02 10:26:16 (9 years ago)

Author:

mijoilmo

Message:

 

File:

• 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml (modified) (5 diffs)

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

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb</Output>
-      <Time>2014-07-01T12:29:06.4651495+03:00</Time>
+      <Time>0001-01-01T00:00:00</Time>
     </Item>
     <Item>
@@ -17 +17 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
+      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output>
 <<<<<<< .mine
-      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output>
+      <Time>0001-01-01T00:00:00</Time>
+=======
       <Time>2014-07-01T13:37:51.5196654+03:00</Time>
 =======
@@ -24 +26 @@
       <Time>2014-07-02T09:56:28.5035703+03:00</Time>
 >>>>>>> .r5260
+>>>>>>> .r5264
     </Item>
     <Item>
@@ -32 +35 @@
       <Options>None</Options>
       <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb</Output>
-      <Time>2014-07-01T13:39:05.8200947+03:00</Time>
+      <Time>0001-01-01T00:00:00</Time>
     </Item>
+<<<<<<< .mine
+    <BuildSuccessful>false</BuildSuccessful>
+=======
 <<<<<<< .mine
     <Item>
@@ -95 +101 @@
 >>>>>>> .r5262
     <BuildSuccessful>true</BuildSuccessful>
+>>>>>>> .r5264
     <Settings>
       <ContentProjectGUID>{5156C658-EF8C-4216-BA6D-9928D133FE72}</ContentProjectGUID>