diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-11-18 16:29:54 +0000 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-11-18 16:29:54 +0000 |
| commit | 4037be53b29a122732cfc10693e9c0027f606bb0 (patch) | |
| tree | 8533ea9ee0ac8f5f7f696b85cb039f783657ada0 /ShiftOS.Main/Properties | |
| parent | 65b7ac2b8cbc4478f6d31a21f106048aeb075078 (diff) | |
| parent | 97722fbe9d474adffbba0b92e9727c48a8205234 (diff) | |
| download | shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.tar.gz shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.tar.bz2 shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.zip | |
Updated my fork!
Conflicts:
ShiftOS.Engine/ShiftOS.Engine.csproj
ShiftOS.Engine/Terminal/Commands/Hello.cs
ShiftOS.Engine/Terminal/TerminalBackend.cs
ShiftOS.Engine/Terminal/TerminalCommand.cs
ShiftOS.Main/ShiftOS.Main.csproj
ShiftOS.Main/ShiftOS/Apps/Terminal.cs
ShiftOS.Main/ShiftOS/Desktop.cs
Diffstat (limited to 'ShiftOS.Main/Properties')
| -rw-r--r-- | ShiftOS.Main/Properties/AssemblyInfo.cs | 3 | ||||
| -rw-r--r-- | ShiftOS.Main/Properties/Settings.settings | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ShiftOS.Main/Properties/AssemblyInfo.cs b/ShiftOS.Main/Properties/AssemblyInfo.cs index 6f85581..bcab0d6 100644 --- a/ShiftOS.Main/Properties/AssemblyInfo.cs +++ b/ShiftOS.Main/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -33,4 +32,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file diff --git a/ShiftOS.Main/Properties/Settings.settings b/ShiftOS.Main/Properties/Settings.settings index 3964565..e04fc63 100644 --- a/ShiftOS.Main/Properties/Settings.settings +++ b/ShiftOS.Main/Properties/Settings.settings @@ -1,7 +1,8 @@ <?xml version='1.0' encoding='utf-8'?> + <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> <Profiles> <Profile Name="(Default)" /> </Profiles> <Settings /> -</SettingsFile> +</SettingsFile>
\ No newline at end of file |