Changeset 6720 for 2015/27


Ignore:
Timestamp:
2015-07-02 09:38:48 (4 years ago)
Author:
vivahann
Message:
 
Location:
2015/27/EemilI/infected - Copy
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • 2015/27/EemilI/infected - Copy/infected/infected/bin

    • Property svn:global-ignores set to
      x86
  • 2015/27/EemilI/infected - Copy/infected/infected/obj/x86/Debug/ContentPipeline-{B898C966-80ED-44D3-9FBA-1E981C2850D4}.xml

    r6686 r6720  
    99      <Options>None</Options> 
    1010      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\hahmon kuva.xnb</Output> 
    11       <Time>2015-07-01T11:23:43.7390934+03:00</Time> 
     11      <Time>2015-07-01T13:50:40.8586631+03:00</Time> 
    1212    </Item> 
    1313    <Item> 
     
    1818      <Options>None</Options> 
    1919      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\mappi.xnb</Output> 
     20<<<<<<< .mine 
     21      <Time>2015-07-01T13:50:40.8742631+03:00</Time> 
     22======= 
    2023      <Time>2015-07-01T14:17:18.6995934+03:00</Time> 
     24>>>>>>> .r6719 
    2125    </Item> 
    2226    <Item> 
     
    2731      <Options>None</Options> 
    2832      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\kauppa.xnb</Output> 
    29       <Time>2015-07-01T10:38:55.3825934+03:00</Time> 
     33      <Time>2015-07-01T13:50:40.8586631+03:00</Time> 
    3034    </Item> 
    3135    <Item> 
     
    3640      <Options>None</Options> 
    3741      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\zombi.xnb</Output> 
    38       <Time>2015-07-01T11:24:35.8850934+03:00</Time> 
     42      <Time>2015-07-01T13:50:40.8430631+03:00</Time> 
    3943    </Item> 
    4044    <Item> 
     
    4549      <Options>None</Options> 
    4650      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\seina.xnb</Output> 
    47       <Time>2015-07-01T11:46:15.3660934+03:00</Time> 
     51      <Time>2015-07-01T13:50:40.8430631+03:00</Time> 
    4852    </Item> 
    4953    <Item> 
     
    5458      <Options>None</Options> 
    5559      <Output>C:\MyTemp\EemilI\infected - Copy\infected\infected\bin\x86\Debug\Content\mieskuva.xnb</Output> 
    56       <Time>2015-07-01T13:48:07.3270934+03:00</Time> 
     60      <Time>2015-07-01T13:50:40.8742631+03:00</Time> 
    5761    </Item> 
    5862    <BuildSuccessful>true</BuildSuccessful> 
     
    103107      <Assembly> 
    104108        <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> 
    105         <Value>2012-07-09T09:25:54.5016898+03:00</Value> 
     109        <Value>2012-07-09T09:56:07.3404899+03:00</Value> 
    106110      </Assembly> 
    107111    </Assemblies> 
Note: See TracChangeset for help on using the changeset viewer.