Ignore:
Timestamp:
2017-10-21 15:05:42 (20 months ago)
Author:
mianhayr
Message:
 
Location:
2016/30/TaavettiV/Street Alien Domination/Street Alien Domination/Street_Alien_Domination/obj/x86/Debug
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • 2016/30/TaavettiV/Street Alien Domination/Street Alien Domination/Street_Alien_Domination/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml

    r9466 r9469  
    88      <Processor>SoundEffectProcessor</Processor> 
    99      <Options>None</Options> 
     10<<<<<<< .mine 
     11      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maali.xnb</Output> 
     12      <Time>2017-10-21T11:34:39.8020872+03:00</Time> 
     13======= 
    1014      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maali.xnb</Output> 
    1115      <Time>2017-10-21T11:19:38.9133523+03:00</Time> 
     16>>>>>>> .r9468 
    1217    </Item> 
    1318    <Item> 
     
    1722      <Processor>TextureProcessor</Processor> 
    1823      <Options>None</Options> 
     24<<<<<<< .mine 
     25      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\norsu.xnb</Output> 
     26      <Time>2017-10-21T11:34:39.9114644+03:00</Time> 
     27======= 
    1928      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\norsu.xnb</Output> 
    2029      <Time>2017-10-21T11:19:39.0227262+03:00</Time> 
     30>>>>>>> .r9468 
    2131    </Item> 
    2232    <Item> 
     
    2636      <Processor>TextureProcessor</Processor> 
    2737      <Options>None</Options> 
     38<<<<<<< .mine 
     39      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tahti.xnb</Output> 
     40      <Time>2017-10-21T11:34:39.9270885+03:00</Time> 
     41======= 
    2842      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tahti.xnb</Output> 
    2943      <Time>2017-10-21T11:19:39.038354+03:00</Time> 
     44>>>>>>> .r9468 
    3045    </Item> 
    3146    <Item> 
     
    3550      <Processor>TextureProcessor</Processor> 
    3651      <Options>None</Options> 
     52<<<<<<< .mine 
     53      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pomp.xnb</Output> 
     54      <Time>2017-10-21T11:34:39.9427129+03:00</Time> 
     55======= 
    3756      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pomp.xnb</Output> 
    3857      <Time>2017-10-21T11:19:39.0539784+03:00</Time> 
     58>>>>>>> .r9468 
    3959    </Item> 
    4060    <Item> 
     
    4464      <Processor>TextureProcessor</Processor> 
    4565      <Options>None</Options> 
     66<<<<<<< .mine 
     67      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tähtäin.xnb</Output> 
     68      <Time>2017-10-21T11:34:39.8802136+03:00</Time> 
     69======= 
    4670      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tähtäin.xnb</Output> 
    4771      <Time>2017-10-21T11:19:38.99148+03:00</Time> 
     72>>>>>>> .r9468 
    4873    </Item> 
    4974    <Item> 
     
    5378      <Processor>TextureProcessor</Processor> 
    5479      <Options>None</Options> 
     80<<<<<<< .mine 
     81      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\parasase.xnb</Output> 
     82      <Time>2017-10-21T11:34:39.833338+03:00</Time> 
     83======= 
    5584      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\parasase.xnb</Output> 
    5685      <Time>2017-10-21T11:19:38.9446008+03:00</Time> 
     86>>>>>>> .r9468 
    5787    </Item> 
    5888    <Item> 
     
    6292      <Processor>TextureProcessor</Processor> 
    6393      <Options>None</Options> 
     94<<<<<<< .mine 
     95      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\knight.xnb</Output> 
     96      <Time>2017-10-21T11:34:39.958338+03:00</Time> 
     97======= 
    6498      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\knight.xnb</Output> 
    6599      <Time>2017-10-21T11:19:39.0696058+03:00</Time> 
     100>>>>>>> .r9468 
    66101    </Item> 
    67102    <Item> 
     
    71106      <Processor>TextureProcessor</Processor> 
    72107      <Options>None</Options> 
     108<<<<<<< .mine 
     109      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pelityyppiparas.xnb</Output> 
     110      <Time>2017-10-21T11:34:39.8177133+03:00</Time> 
     111======= 
    73112      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pelityyppiparas.xnb</Output> 
    74113      <Time>2017-10-21T11:19:38.9289767+03:00</Time> 
     114>>>>>>> .r9468 
    75115    </Item> 
    76116    <Item> 
     
    80120      <Processor>TextureProcessor</Processor> 
    81121      <Options>None</Options> 
     122<<<<<<< .mine 
     123      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\bosspoop.xnb</Output> 
     124      <Time>2017-10-21T11:34:39.8802136+03:00</Time> 
     125======= 
    82126      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\bosspoop.xnb</Output> 
    83127      <Time>2017-10-21T11:19:38.99148+03:00</Time> 
     128>>>>>>> .r9468 
    84129    </Item> 
    85130    <Item> 
     
    89134      <Processor>TextureProcessor</Processor> 
    90135      <Options>None</Options> 
     136<<<<<<< .mine 
     137      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\outohirvio.xnb</Output> 
     138      <Time>2017-10-21T11:34:39.9270885+03:00</Time> 
     139======= 
    91140      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\outohirvio.xnb</Output> 
    92141      <Time>2017-10-21T11:19:39.038354+03:00</Time> 
    93     </Item> 
    94     <Item> 
     142>>>>>>> .r9468 
     143    </Item> 
     144    <Item> 
     145<<<<<<< .mine 
    95146      <Source>maalipoo.png</Source> 
    96147      <Name>maalipoo</Name> 
     
    98149      <Processor>TextureProcessor</Processor> 
    99150      <Options>None</Options> 
     151      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maalipoo.xnb</Output> 
     152      <Time>2017-10-21T11:34:39.833338+03:00</Time> 
     153    </Item> 
     154    <Item> 
     155======= 
     156      <Source>maalipoo.png</Source> 
     157      <Name>maalipoo</Name> 
     158      <Importer>TextureImporter</Importer> 
     159      <Processor>TextureProcessor</Processor> 
     160      <Options>None</Options> 
    100161      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maalipoo.xnb</Output> 
    101162      <Time>2017-10-21T11:19:38.9446008+03:00</Time> 
    102163    </Item> 
    103164    <Item> 
     165>>>>>>> .r9468 
    104166      <Source>kentta1.txt</Source> 
    105167      <Name>kentta1</Name> 
     
    107169      <Processor>TextFileContentProcessor</Processor> 
    108170      <Options>None</Options> 
     171<<<<<<< .mine 
     172      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta1.xnb</Output> 
     173      <Time>2017-10-21T14:19:16.6613202+03:00</Time> 
     174======= 
    109175      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta1.xnb</Output> 
    110176      <Time>2017-10-21T11:19:38.9758516+03:00</Time> 
     177>>>>>>> .r9468 
    111178    </Item> 
    112179    <Item> 
     
    116183      <Processor>TextFileContentProcessor</Processor> 
    117184      <Options>None</Options> 
     185<<<<<<< .mine 
     186      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta4.xnb</Output> 
     187      <Time>2017-10-21T14:11:48.3274563+03:00</Time> 
     188======= 
    118189      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta4.xnb</Output> 
    119190      <Time>2017-10-21T14:11:59.7656146+03:00</Time> 
     191>>>>>>> .r9468 
    120192    </Item> 
    121193    <Item> 
     
    125197      <Processor>TextFileContentProcessor</Processor> 
    126198      <Options>None</Options> 
     199<<<<<<< .mine 
     200      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta2.xnb</Output> 
     201      <Time>2017-10-21T11:34:39.8645895+03:00</Time> 
     202======= 
    127203      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta2.xnb</Output> 
    128204      <Time>2017-10-21T11:19:38.9758516+03:00</Time> 
     205>>>>>>> .r9468 
    129206    </Item> 
    130207    <Item> 
     
    134211      <Processor>TextFileContentProcessor</Processor> 
    135212      <Options>None</Options> 
     213<<<<<<< .mine 
     214      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta3.xnb</Output> 
     215      <Time>2017-10-21T11:34:39.895837+03:00</Time> 
     216======= 
    136217      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta3.xnb</Output> 
    137218      <Time>2017-10-21T11:19:39.0071045+03:00</Time> 
     219>>>>>>> .r9468 
    138220    </Item> 
    139221    <Item> 
     
    143225      <Processor>TextFileContentProcessor</Processor> 
    144226      <Options>None</Options> 
     227<<<<<<< .mine 
     228      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta5.xnb</Output> 
     229      <Time>2017-10-21T11:34:39.9114644+03:00</Time> 
     230======= 
    145231      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta5.xnb</Output> 
    146232      <Time>2017-10-21T11:19:39.0227262+03:00</Time> 
     233>>>>>>> .r9468 
    147234    </Item> 
    148235    <Item> 
     
    152239      <Processor>SongProcessor</Processor> 
    153240      <Options>None</Options> 
     241<<<<<<< .mine 
     242      <Output>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.xnb</Output> 
     243      <Extra>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.wma</Extra> 
     244      <Time>2017-10-21T11:34:39.8645895+03:00</Time> 
     245======= 
    154246      <Output>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.xnb</Output> 
    155247      <Extra>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.wma</Extra> 
    156248      <Time>2017-10-21T11:19:38.9602256+03:00</Time> 
     249>>>>>>> .r9468 
    157250    </Item> 
    158251    <BuildSuccessful>true</BuildSuccessful> 
     
    163256      <BuildConfiguration>Debug</BuildConfiguration> 
    164257      <CompressContent>false</CompressContent> 
     258<<<<<<< .mine 
     259      <RootDirectory>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street Alien DominationContent\</RootDirectory> 
     260      <LoggerRootDirectory>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\</LoggerRootDirectory> 
     261      <IntermediateDirectory>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\</IntermediateDirectory> 
     262      <OutputDirectory>C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\</OutputDirectory> 
     263======= 
    165264      <RootDirectory>C:\MyTemp\New folder\Street Alien Domination\Street Alien DominationContent\</RootDirectory> 
    166265      <LoggerRootDirectory>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\</LoggerRootDirectory> 
    167266      <IntermediateDirectory>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\</IntermediateDirectory> 
    168267      <OutputDirectory>C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\</OutputDirectory> 
     268>>>>>>> .r9468 
    169269    </Settings> 
    170270    <Assemblies> 
     
    202302      </Assembly> 
    203303      <Assembly> 
     304<<<<<<< .mine 
     305        <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> 
     306        <Value>2017-07-07T10:04:07.3026679+03:00</Value> 
     307======= 
    204308        <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> 
    205309        <Value>2017-08-16T12:04:26.3073054+03:00</Value> 
     310>>>>>>> .r9468 
    206311      </Assembly> 
    207312    </Assemblies> 
  • 2016/30/TaavettiV/Street Alien Domination/Street Alien Domination/Street_Alien_Domination/obj/x86/Debug/Street_Alien_Domination.csproj.FileListAbsolute.txt

    r9466 r9469  
    7070C:\MyTemp\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.exe 
    7171C:\MyTemp\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.pdb 
     72<<<<<<< .mine 
     73C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maali.xnb 
     74C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\norsu.xnb 
     75C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tahti.xnb 
     76C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pomp.xnb 
     77C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\tÀhtÀin.xnb 
     78C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\parasase.xnb 
     79C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\knight.xnb 
     80C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\pelityyppiparas.xnb 
     81C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\bosspoop.xnb 
     82C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\outohirvio.xnb 
     83C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maalipoo.xnb 
     84C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta1.xnb 
     85C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta4.xnb 
     86C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta2.xnb 
     87C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta3.xnb 
     88C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\kentta5.xnb 
     89C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.xnb 
     90C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\taustamusa.wma 
     91C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Street_Alien_Domination.exe 
     92C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Street_Alien_Domination.pdb 
     93C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Jypeli.dll 
     94C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Jypeli.xml 
     95C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.csprojResolveAssemblyReference.cache 
     96C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt 
     97C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.exe 
     98C:\MyTemp\street alien blablabla\Street Alien Domination\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.pdb 
     99======= 
    72100C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\maali.xnb 
    73101C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\bin\x86\Debug\Content\norsu.xnb 
     
    96124C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.exe 
    97125C:\MyTemp\New folder\Street Alien Domination\Street_Alien_Domination\obj\x86\Debug\Street_Alien_Domination.pdb 
     126>>>>>>> .r9468 
Note: See TracChangeset for help on using the changeset viewer.