Commit bf443041 authored by BARBI HUGO's avatar BARBI HUGO
Browse files

Merge branch 'master' into 'master'

Final Installer

See merge request !171
parents 6010705c 99e255d4
......@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "20School", "20School.csproj", "{615CC71C-8959-4C24-90B5-7EE39A266C0D}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "20SchoolSetup", "..\20SchoolSetup\20SchoolSetup.vdproj", "{EE15F58A-8864-453B-A76A-7D17852C80E6}"
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "20SchoolSetup", "..\20SchoolSetup\20SchoolSetup.vdproj", "{339B7045-DCB4-44DD-B3F2-8B08020CE974}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -17,8 +17,8 @@ Global
{615CC71C-8959-4C24-90B5-7EE39A266C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{615CC71C-8959-4C24-90B5-7EE39A266C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{615CC71C-8959-4C24-90B5-7EE39A266C0D}.Release|Any CPU.Build.0 = Release|Any CPU
{EE15F58A-8864-453B-A76A-7D17852C80E6}.Debug|Any CPU.ActiveCfg = Debug
{EE15F58A-8864-453B-A76A-7D17852C80E6}.Release|Any CPU.ActiveCfg = Release
{339B7045-DCB4-44DD-B3F2-8B08020CE974}.Debug|Any CPU.ActiveCfg = Debug
{339B7045-DCB4-44DD-B3F2-8B08020CE974}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
c05f0baaafd81bb9e925eb273c7ff410eac59d49
deee0908694ecc6a5a7c09779dde7058feb72383
......@@ -55,7 +55,6 @@ C:\Users\okkes\Downloads\20schoolt3-7e98de1d4ec9bda0c475de4749d2e7f830acce4b\20S
C:\Users\okkes\Downloads\20schoolt3-7e98de1d4ec9bda0c475de4749d2e7f830acce4b\20School\obj\Debug\20School.exe
C:\Users\okkes\Downloads\20schoolt3-7e98de1d4ec9bda0c475de4749d2e7f830acce4b\20School\obj\Debug\20School.pdb
C:\Users\okkes\Desktop\cmder\20schoolT3\20School\obj\Debug\_20School.fmCoursParticulier.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Debug\_20School.fmGameChargingcs.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Debug\_20School.fmGraphFinal.resources
C:\Users\Hugo\git\20schoolt3\20School\bin\Debug\LiveCharts.dll
C:\Users\Hugo\git\20schoolt3\20School\bin\Debug\LiveCharts.WinForms.dll
......
6c9f22119257cdd30f5676ef68d224422cc4d26d
25c3937a865432f09943cf6c04b8c3e287fb0d2b
......@@ -12,14 +12,14 @@ C:\Users\Hugo\git\20schoolt3\20School\bin\Release\LiveCharts.Wpf.pdb
C:\Users\Hugo\git\20schoolt3\20School\bin\Release\LiveCharts.Wpf.xml
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.csprojAssemblyReference.cache
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmCoursParticulier.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmGameChargingcs.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmGraphFinal.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.Menu.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.Play.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.Properties.Resources.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.Rules.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.csproj.GenerateResource.cache
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.csproj.CoreCompileInputs.cache
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.csproj.CopyComplete
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.exe
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\20School.pdb
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmPlay.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmRecap.resources
C:\Users\Hugo\git\20schoolt3\20School\obj\Release\_20School.fmRules.resources
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment