Changeset 6720 for 2015/27/EemilI/infected - Copy

Timestamp:

2015-07-02 09:38:48 (8 years ago)

Author:

vivahann

Message:

 

Location:

2015/27/EemilI/infected - Copy

Files:

• infected.suo (modified) (previous)
• infected/infected/bin (modified) (1 prop)
• infected/infected/bin/x86 (deleted)
• infected/infected/obj/x86/Debug/ContentPipeline-{B898C966-80ED-44D3-9FBA-1E981C2850D4}.xml (modified) (7 diffs)
• infected/infected/obj/x86/Debug/infected.exe (modified) (previous)
• infected/infected/obj/x86/Debug/infected.pdb (modified) (previous)
• infected/infectedContent/JuanDeag.png (added)

2015/27/EemilI/infected - Copy/infected/infected/obj/x86/Debug/ContentPipeline-{B898C966-80ED-44D3-9FBA-1E981C2850D4}.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\hahmon kuva.xnb</Output>
-      <Time>2015-07-01T11:23:43.7390934+03:00</Time>
+      <Time>2015-07-01T13:50:40.8586631+03:00</Time>
     </Item>
     <Item>
@@ -18 +18 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\mappi.xnb</Output>
+<<<<<<< .mine
+      <Time>2015-07-01T13:50:40.8742631+03:00</Time>
+=======
       <Time>2015-07-01T14:17:18.6995934+03:00</Time>
+>>>>>>> .r6719
     </Item>
     <Item>
@@ -27 +31 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\kauppa.xnb</Output>
-      <Time>2015-07-01T10:38:55.3825934+03:00</Time>
+      <Time>2015-07-01T13:50:40.8586631+03:00</Time>
     </Item>
     <Item>
@@ -36 +40 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\zombi.xnb</Output>
-      <Time>2015-07-01T11:24:35.8850934+03:00</Time>
+      <Time>2015-07-01T13:50:40.8430631+03:00</Time>
     </Item>
     <Item>
@@ -45 +49 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\seina.xnb</Output>
-      <Time>2015-07-01T11:46:15.3660934+03:00</Time>
+      <Time>2015-07-01T13:50:40.8430631+03:00</Time>
     </Item>
     <Item>
@@ -54 +58 @@
       <Options>None</Options>
       <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\mieskuva.xnb</Output>
-      <Time>2015-07-01T13:48:07.3270934+03:00</Time>
+      <Time>2015-07-01T13:50:40.8742631+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -103 +107 @@
       <Assembly>
         <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>
-        <Value>2012-07-09T09:25:54.5016898+03:00</Value>
+        <Value>2012-07-09T09:56:07.3404899+03:00</Value>
       </Assembly>
     </Assemblies>