- Timestamp:
- 2014-07-02 10:49:24 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/ContentPipeline-{5156C658-EF8C-4216-BA6D-9928D133FE72}.xml
r5266 r5271 8 8 <Processor>TextureProcessor</Processor> 9 9 <Options>None</Options> 10 <Output>C:\MyTemp\AleksanteriV 2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb</Output>11 <Time> 0001-01-01T00:00:00</Time>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> 12 12 </Item> 13 13 <Item> … … 17 17 <Processor>TextureProcessor</Processor> 18 18 <Options>None</Options> 19 <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output>20 <<<<<<< .mine21 <Time>0001-01-01T00:00:00</Time>22 =======23 <Time>2014-07-01T13:37:51.5196654+03:00</Time>24 =======25 19 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb</Output> 26 20 <Time>2014-07-02T09:56:28.5035703+03:00</Time> 27 >>>>>>> .r526028 >>>>>>> .r526429 21 </Item> 30 22 <Item> … … 34 26 <Processor>TextureProcessor</Processor> 35 27 <Options>None</Options> 36 <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb</Output> 37 <Time>0001-01-01T00:00:00</Time> 38 </Item> 39 <<<<<<< .mine 40 <BuildSuccessful>false</BuildSuccessful> 41 ======= 42 <<<<<<< .mine 43 <Item> 44 <<<<<<< .mine 45 ======= 46 <Source>graphics\levels\test.png</Source> 47 <Name>graphics\levels\test</Name> 48 <Importer>TextureImporter</Importer> 49 <Processor>TextureProcessor</Processor> 50 <Options>None</Options> 51 <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb</Output> 52 <Time>2014-07-02T09:40:48.8214089+03:00</Time> 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> 53 30 </Item> 54 31 <Item> 55 <Source>graphics\effects\thrusters\thruster0.1.png</Source>56 <Name>graphics\effects\thrusters\thruster0.1</Name>57 <Importer>TextureImporter</Importer>58 <Processor>TextureProcessor</Processor>59 <Options>None</Options>60 <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb</Output>61 <Time>2014-07-02T09:40:48.8526091+03:00</Time>62 </Item>63 <Item>64 <Source>graphics\effects\thrusters\thruster0.2.png</Source>65 <Name>graphics\effects\thrusters\thruster0.2</Name>66 <Importer>TextureImporter</Importer>67 <Processor>TextureProcessor</Processor>68 <Options>None</Options>69 <Output>C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb</Output>70 <Time>2014-07-02T09:40:48.8526091+03:00</Time>71 </Item>72 =======73 <Item>74 <Source>graphics\levels\test.png</Source>75 <Name>graphics\levels\test</Name>76 <Importer>TextureImporter</Importer>77 <Processor>TextureProcessor</Processor>78 <Options>None</Options>79 <Output>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb</Output>80 <Time>2014-07-02T09:34:30.1166324+03:00</Time>81 </Item>82 <Item>83 >>>>>>> .r526384 32 <Source>graphics\effects\thrusters\thruster0.1.png</Source> 85 33 <Name>graphics\effects\thrusters\thruster0.1</Name> … … 99 47 <Time>2014-07-02T09:34:30.0698321+03:00</Time> 100 48 </Item> 101 >>>>>>> .r5262102 49 <BuildSuccessful>true</BuildSuccessful> 103 >>>>>>> .r5264104 50 <Settings> 105 51 <ContentProjectGUID>{5156C658-EF8C-4216-BA6D-9928D133FE72}</ContentProjectGUID> … … 108 54 <BuildConfiguration>Debug</BuildConfiguration> 109 55 <CompressContent>false</CompressContent> 110 <RootDirectory>C:\MyTemp\AleksanteriV 2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivorContent\</RootDirectory>111 <LoggerRootDirectory>C:\MyTemp\AleksanteriV 2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\</LoggerRootDirectory>112 <IntermediateDirectory>C:\MyTemp\AleksanteriV 2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\</IntermediateDirectory>113 <OutputDirectory>C:\MyTemp\AleksanteriV 2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\</OutputDirectory>56 <RootDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivorContent\</RootDirectory> 57 <LoggerRootDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\</LoggerRootDirectory> 58 <IntermediateDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\</IntermediateDirectory> 59 <OutputDirectory>C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\</OutputDirectory> 114 60 </Settings> 115 61 <Assemblies> 116 62 <Assembly> 117 63 <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key> 118 <Value>201 4-06-10T15:50:44+03:00</Value>64 <Value>2013-09-06T09:39:14+03:00</Value> 119 65 </Assembly> 120 66 <Assembly> … … 144 90 <Assembly> 145 91 <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key> 146 <Value>201 4-06-10T15:50:44+03:00</Value>92 <Value>2013-09-06T09:39:16+03:00</Value> 147 93 </Assembly> 148 94 <Assembly> 149 95 <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> 150 <Value>2014-04-22T2 0:58:03.8700212+03:00</Value>96 <Value>2014-04-22T21:32:12.354917+03:00</Value> 151 97 </Assembly> 152 98 </Assemblies>
Note: See TracChangeset
for help on using the changeset viewer.