Commit 79ad87d0ffbf2682f44c0a8c8fe5e24988297f78

  • avatar
  • Lauri Jere Sakari Pitkänen <lajesapi @stu…nt.jyu.fi> (Committer)
  • Fri Oct 04 12:53:24 EEST 2013
  • avatar
  • Lauri Jere Sakari Pitkänen <lajesapi @stu…nt.jyu.fi> (Author)
  • Fri Oct 04 12:53:24 EEST 2013
valkoinen laatikko
Assembly-CSharp.csproj
(2 / 6)
  
4848 </ItemGroup>
4949 <ItemGroup>
5050 <ProjectReference Include="Assembly-CSharp-firstpass.csproj">
51<<<<<<< HEAD
52 <Project>{86F01345-A771-AC2D-5110-E119D588FC45}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
53 <ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
54 <Project>{AF603E2F-1C53-FDC9-A936-D60F57040F70}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
55=======
5651 <Project>{AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
57>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
52 <ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
53 <Project>{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
5854 </ItemGroup>
5955 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6056 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Assembly-UnityScript-firstpass-vs.unityproj
(1 / 1)
  
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66 <ProductVersion>10.0.20506</ProductVersion>
77 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{AF603E2F-1C53-FDC9-A936-D60F57040F70}</ProjectGuid>
8 <ProjectGuid>{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}</ProjectGuid>
99 <OutputType>Library</OutputType>
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace></RootNamespace>
Assembly-UnityScript-firstpass.unityproj
(1 / 1)
  
55 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66 <ProductVersion>10.0.20506</ProductVersion>
77 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{AF603E2F-1C53-FDC9-A936-D60F57040F70}</ProjectGuid>
8 <ProjectGuid>{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}</ProjectGuid>
99 <OutputType>Library</OutputType>
1010 <AppDesignerFolder>Properties</AppDesignerFolder>
1111 <RootNamespace></RootNamespace>
Assets/Materials/No Name.mat.meta
(1 / 1)
  
11fileFormatVersion: 2
2guid: cc5aebfc133a2fa459ad70a929e26ff9
2guid: 512f3d9a2d7594246abb732614ddbe30
33NativeFormatImporter:
44 userData:
Assets/materiaali1.mat
(1 / 1)
Binary files differ
InstruTrivia-csharp.sln
(2 / 3)
  
2323 GlobalSection(SolutionProperties) = preSolution
2424 HideSolutionNode = FALSE
2525 EndGlobalSection
26<<<<<<< HEAD
27 GlobalSection(MonoDevelopProperties) = preSolution
26 GlobalSection(MonoDevelopProperties) = preSolution
2827=======
29 GlobalSection(MonoDevelopProperties) = preSolution
28 GlobalSection(MonoDevelopProperties) = preSolution
3029>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
3130 StartupItem = Assembly-CSharp.csproj
3231 Policies = $0
InstruTrivia.sln
(6 / 18)
  
55EndProject
66Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-CSharp.csproj", "{24A579A7-3ADB-D23C-9C93-1EE5FABD277A}"
77EndProject
8Project("{F6E0AB27-8773-3437-EA6F-CC7C7B1772DB}") = "InstruTrivia", "Assembly-UnityScript-firstpass.unityproj", "{AF603E2F-1C53-FDC9-A936-D60F57040F70}"
8Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-UnityScript-firstpass.unityproj", "{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}"
99EndProject
1010Global
1111 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1313 Release|Any CPU = Release|Any CPU
1414 EndGlobalSection
1515 GlobalSection(ProjectConfigurationPlatforms) = postSolution
16<<<<<<< HEAD
17 {86F01345-A771-AC2D-5110-E119D588FC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18 {86F01345-A771-AC2D-5110-E119D588FC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
19 {86F01345-A771-AC2D-5110-E119D588FC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
20 {86F01345-A771-AC2D-5110-E119D588FC45}.Release|Any CPU.Build.0 = Release|Any CPU
21 {A400726D-2EB4-E505-218E-3FDA3A1D827A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22 {A400726D-2EB4-E505-218E-3FDA3A1D827A}.Debug|Any CPU.Build.0 = Debug|Any CPU
23 {A400726D-2EB4-E505-218E-3FDA3A1D827A}.Release|Any CPU.ActiveCfg = Release|Any CPU
24 {A400726D-2EB4-E505-218E-3FDA3A1D827A}.Release|Any CPU.Build.0 = Release|Any CPU
25 {AF603E2F-1C53-FDC9-A936-D60F57040F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26 {AF603E2F-1C53-FDC9-A936-D60F57040F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
27 {AF603E2F-1C53-FDC9-A936-D60F57040F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
28 {AF603E2F-1C53-FDC9-A936-D60F57040F70}.Release|Any CPU.Build.0 = Release|Any CPU
29=======
3016 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3117 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
3218 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
2121 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Debug|Any CPU.Build.0 = Debug|Any CPU
2222 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2323 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Release|Any CPU.Build.0 = Release|Any CPU
24>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
24 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Release|Any CPU.Build.0 = Release|Any CPU
2528 EndGlobalSection
2629 GlobalSection(SolutionProperties) = preSolution
2730 HideSolutionNode = FALSE
2831 EndGlobalSection
29<<<<<<< HEAD
30 GlobalSection(MonoDevelopProperties) = preSolution
32 GlobalSection(MonoDevelopProperties) = preSolution
3133=======
3234 GlobalSection(MonoDevelopProperties) = preSolution
3335>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
Library/assetDatabase3
(8 / 7)
Binary files differ
Library/guidmapper
(2 / 2)
Binary files differ
Library/metadata/04/04fde1049e7f58344822c999cd576c34
(17 / 25)
Binary files differ