Skip to content

Commit

Permalink
fix some typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
lovettchris committed Feb 15, 2017
1 parent 00b4eba commit f12164a
Show file tree
Hide file tree
Showing 60 changed files with 16,527 additions and 16,516 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,4 @@ ModelManifest.xml
/AirLib/CTestTestfile.cmake
/AirLib/cmake_install.cmake
/MavLinkCom/lib/libMavLinkCom.a
/Unreal/Plugins/AirLib
/Unreal/Plugins/AirSim/Source/AirLib/
96 changes: 48 additions & 48 deletions LogViewer/LogViewer.sln
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogViewer", "LogViewer\LogViewer.csproj", "{EF15F348-8E2A-44FE-BA67-B7642562FDE7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Networking", "Networking\Networking.csproj", "{29C99047-525D-4389-9BF1-CC130755A135}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x64.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x86.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x86.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|Any CPU.Build.0 = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x64.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x64.Build.0 = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x86.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x86.Build.0 = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x64.ActiveCfg = Debug|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x64.Build.0 = Debug|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x86.ActiveCfg = Debug|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x86.Build.0 = Debug|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Release|Any CPU.Build.0 = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x64.ActiveCfg = Release|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x64.Build.0 = Release|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x86.ActiveCfg = Release|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogViewer", "LogViewer\LogViewer.csproj", "{EF15F348-8E2A-44FE-BA67-B7642562FDE7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Networking", "Networking\Networking.csproj", "{29C99047-525D-4389-9BF1-CC130755A135}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x64.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x86.ActiveCfg = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Debug|x86.Build.0 = Debug|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|Any CPU.Build.0 = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x64.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x64.Build.0 = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x86.ActiveCfg = Release|Any CPU
{EF15F348-8E2A-44FE-BA67-B7642562FDE7}.Release|x86.Build.0 = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x64.ActiveCfg = Debug|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x64.Build.0 = Debug|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x86.ActiveCfg = Debug|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Debug|x86.Build.0 = Debug|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Release|Any CPU.Build.0 = Release|Any CPU
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x64.ActiveCfg = Release|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x64.Build.0 = Release|x64
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x86.ActiveCfg = Release|x86
{29C99047-525D-4389-9BF1-CC130755A135}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
10 changes: 5 additions & 5 deletions LogViewer/LogViewer/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>
26 changes: 13 additions & 13 deletions LogViewer/LogViewer/App.xaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Application x:Class="LogViewer.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:LogViewer"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/generic.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
<Application x:Class="LogViewer.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:LogViewer"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/generic.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
56 changes: 28 additions & 28 deletions LogViewer/LogViewer/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
using LogViewer.Utilities;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace LogViewer
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
Settings settings;

public async Task<Settings> LoadSettings()
{
if (this.settings == null) {
this.settings = await Settings.LoadAsync();
}
return this.settings;
}

}
}
using LogViewer.Utilities;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace LogViewer
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
Settings settings;

public async Task<Settings> LoadSettings()
{
if (this.settings == null) {
this.settings = await Settings.LoadAsync();
}
return this.settings;
}

}
}
Loading

0 comments on commit f12164a

Please sign in to comment.