Changeset 5263 for 2014/27


Ignore:
Timestamp:
2014-07-02 10:18:01 (5 years ago)
Author:
mijoilmo
Message:
 
Location:
2014/27/AleksanteriV/Protokolla236TrueSurvivor
Files:
1 added
12 edited

Legend:

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

    r5261 r5263  
    88      <Processor>TextureProcessor</Processor> 
    99      <Options>None</Options> 
    10       <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb</Output> 
    11       <Time>2014-07-01T10:12:04.6608656+03:00</Time> 
     10      <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> 
    1212    </Item> 
    1313    <Item> 
     
    1717      <Processor>TextureProcessor</Processor> 
    1818      <Options>None</Options> 
     19<<<<<<< .mine 
     20      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 
     21      <Time>2014-07-01T13:37:51.5196654+03:00</Time> 
     22======= 
    1923      <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 
    2024      <Time>2014-07-01T14:56:17.7711213+03:00</Time> 
     25>>>>>>> .r5260 
    2126    </Item> 
    2227    <Item> 
     
    2631      <Processor>TextureProcessor</Processor> 
    2732      <Options>None</Options> 
    28       <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb</Output> 
    29       <Time>2014-07-01T12:37:39.845633+03:00</Time> 
     33      <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> 
    3035    </Item> 
     36<<<<<<< .mine 
     37    <Item> 
     38      <Source>graphics\levels\test.png</Source> 
     39      <Name>graphics\levels\test</Name> 
     40      <Importer>TextureImporter</Importer> 
     41      <Processor>TextureProcessor</Processor> 
     42      <Options>None</Options> 
     43      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb</Output> 
     44      <Time>2014-07-02T09:40:48.8214089+03:00</Time> 
     45    </Item> 
     46    <Item> 
     47      <Source>graphics\effects\thrusters\thruster0.1.png</Source> 
     48      <Name>graphics\effects\thrusters\thruster0.1</Name> 
     49      <Importer>TextureImporter</Importer> 
     50      <Processor>TextureProcessor</Processor> 
     51      <Options>None</Options> 
     52      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb</Output> 
     53      <Time>2014-07-02T09:40:48.8526091+03:00</Time> 
     54    </Item> 
     55    <Item> 
     56      <Source>graphics\effects\thrusters\thruster0.2.png</Source> 
     57      <Name>graphics\effects\thrusters\thruster0.2</Name> 
     58      <Importer>TextureImporter</Importer> 
     59      <Processor>TextureProcessor</Processor> 
     60      <Options>None</Options> 
     61      <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb</Output> 
     62      <Time>2014-07-02T09:40:48.8526091+03:00</Time> 
     63    </Item> 
     64======= 
    3165    <Item> 
    3266      <Source>graphics\levels\test.png</Source> 
     
    5690      <Time>2014-07-02T09:34:30.0698321+03:00</Time> 
    5791    </Item> 
     92>>>>>>> .r5262 
    5893    <BuildSuccessful>true</BuildSuccessful> 
    5994    <Settings> 
     
    6398      <BuildConfiguration>Debug</BuildConfiguration> 
    6499      <CompressContent>false</CompressContent> 
    65       <RootDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivorContent\</RootDirectory> 
    66       <LoggerRootDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\</LoggerRootDirectory> 
    67       <IntermediateDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\</IntermediateDirectory> 
    68       <OutputDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\</OutputDirectory> 
     100      <RootDirectory>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivorContent\</RootDirectory> 
     101      <LoggerRootDirectory>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\</LoggerRootDirectory> 
     102      <IntermediateDirectory>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\</IntermediateDirectory> 
     103      <OutputDirectory>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\</OutputDirectory> 
    69104    </Settings> 
    70105    <Assemblies> 
    71106      <Assembly> 
    72107        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 
    73         <Value>2013-09-06T09:39:14+03:00</Value> 
     108        <Value>2014-06-10T15:50:44+03:00</Value> 
    74109      </Assembly> 
    75110      <Assembly> 
     
    99134      <Assembly> 
    100135        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 
    101         <Value>2013-09-06T09:39:16+03:00</Value> 
     136        <Value>2014-06-10T15:50:44+03:00</Value> 
    102137      </Assembly> 
    103138      <Assembly> 
    104139        <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>2014-04-22T21:32:12.354917+03:00</Value> 
     140        <Value>2014-04-22T20:58:03.8700212+03:00</Value> 
    106141      </Assembly> 
    107142    </Assemblies> 
  • 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

    r5261 r5263  
    2424D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    2525D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
     26<<<<<<< .mine 
     27C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb 
     28C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb 
     29C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb 
     30C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
     31C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
     32C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
     33C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe 
     34C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb 
     35C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.dll 
     36C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.xml 
     37C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache 
     38C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     39C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe 
     40C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb 
     41======= 
    2642C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb 
    2743C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb 
    2844C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb 
     45>>>>>>> .r5261 
Note: See TracChangeset for help on using the changeset viewer.