diff options
| author | Alee <Alee14498@gmail.com> | 2019-02-11 17:12:24 -0500 |
|---|---|---|
| committer | Alee <Alee14498@gmail.com> | 2019-02-11 17:12:24 -0500 |
| commit | ef26e9f3b20a3581a68388390c30f86a6fcb5740 (patch) | |
| tree | 1021b63be92f2fce6443d03588fae288353a4567 /Microbit | |
| parent | 97c66fb4ea00941c83bbf6c0778fced0daf37c9f (diff) | |
| download | Microbit-ef26e9f3b20a3581a68388390c30f86a6fcb5740.tar.gz Microbit-ef26e9f3b20a3581a68388390c30f86a6fcb5740.tar.bz2 Microbit-ef26e9f3b20a3581a68388390c30f86a6fcb5740.zip | |
Added the launcher menu, kernel project and added packages
Diffstat (limited to 'Microbit')
| -rw-r--r-- | Microbit/App.config | 10 | ||||
| -rw-r--r-- | Microbit/MainMenu.Designer.cs | 97 | ||||
| -rw-r--r-- | Microbit/MainMenu.cs | 41 | ||||
| -rw-r--r-- | Microbit/MainMenu.resx | 120 | ||||
| -rw-r--r-- | Microbit/Microbit.Main.csproj (renamed from Microbit/Microbit.csproj) | 27 | ||||
| -rw-r--r-- | Microbit/Program.cs | 21 | ||||
| -rw-r--r-- | Microbit/Properties/Resources.Designer.cs | 46 | ||||
| -rw-r--r-- | Microbit/Properties/Settings.Designer.cs | 22 | ||||
| -rw-r--r-- | Microbit/packages.config | 9 |
9 files changed, 346 insertions, 47 deletions
diff --git a/Microbit/App.config b/Microbit/App.config index 8e15646..00c3e33 100644 --- a/Microbit/App.config +++ b/Microbit/App.config @@ -1,6 +1,14 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <startup> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> </configuration>
\ No newline at end of file diff --git a/Microbit/MainMenu.Designer.cs b/Microbit/MainMenu.Designer.cs index 210b8de..d2b4011 100644 --- a/Microbit/MainMenu.Designer.cs +++ b/Microbit/MainMenu.Designer.cs @@ -28,13 +28,106 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + this.lbTitle = new System.Windows.Forms.Label(); + this.btnStart = new System.Windows.Forms.Button(); + this.wbLauncher = new System.Windows.Forms.WebBrowser(); + this.btnReset = new System.Windows.Forms.Button(); + this.btnExit = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // lbTitle + // + this.lbTitle.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lbTitle.AutoSize = true; + this.lbTitle.Font = new System.Drawing.Font("Consolas", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbTitle.ForeColor = System.Drawing.Color.White; + this.lbTitle.Location = new System.Drawing.Point(39, 32); + this.lbTitle.Name = "lbTitle"; + this.lbTitle.Size = new System.Drawing.Size(270, 32); + this.lbTitle.TabIndex = 0; + this.lbTitle.Text = "Microbit Launcher"; + // + // btnStart + // + this.btnStart.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnStart.Font = new System.Drawing.Font("Consolas", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnStart.ForeColor = System.Drawing.Color.White; + this.btnStart.Location = new System.Drawing.Point(339, 15); + this.btnStart.Name = "btnStart"; + this.btnStart.Size = new System.Drawing.Size(296, 70); + this.btnStart.TabIndex = 1; + this.btnStart.Text = "Start Operating System"; + this.btnStart.UseVisualStyleBackColor = true; + this.btnStart.Click += new System.EventHandler(this.btnStart_Click); + // + // wbLauncher + // + this.wbLauncher.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.wbLauncher.Location = new System.Drawing.Point(31, 101); + this.wbLauncher.MinimumSize = new System.Drawing.Size(20, 20); + this.wbLauncher.Name = "wbLauncher"; + this.wbLauncher.Size = new System.Drawing.Size(728, 318); + this.wbLauncher.TabIndex = 2; + this.wbLauncher.Url = new System.Uri(" http://alee14.ml/Microbit-News/", System.UriKind.Absolute); + // + // btnReset + // + this.btnReset.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnReset.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnReset.ForeColor = System.Drawing.Color.White; + this.btnReset.Location = new System.Drawing.Point(641, 15); + this.btnReset.Name = "btnReset"; + this.btnReset.Size = new System.Drawing.Size(118, 32); + this.btnReset.TabIndex = 3; + this.btnReset.Text = "Reset"; + this.btnReset.UseVisualStyleBackColor = true; + this.btnReset.Click += new System.EventHandler(this.btnReset_Click); + // + // btnExit + // + this.btnExit.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnExit.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnExit.ForeColor = System.Drawing.Color.White; + this.btnExit.Location = new System.Drawing.Point(641, 53); + this.btnExit.Name = "btnExit"; + this.btnExit.Size = new System.Drawing.Size(118, 32); + this.btnExit.TabIndex = 4; + this.btnExit.Text = "Exit"; + this.btnExit.UseVisualStyleBackColor = true; + this.btnExit.Click += new System.EventHandler(this.btnExit_Click); + // + // MainMenu + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Black; this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; + this.ControlBox = false; + this.Controls.Add(this.btnExit); + this.Controls.Add(this.btnReset); + this.Controls.Add(this.wbLauncher); + this.Controls.Add(this.btnStart); + this.Controls.Add(this.lbTitle); + this.Name = "MainMenu"; + this.Text = "Microbit Launcher"; + this.Load += new System.EventHandler(this.MainMenu_Load); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion + + private System.Windows.Forms.Label lbTitle; + private System.Windows.Forms.Button btnStart; + private System.Windows.Forms.WebBrowser wbLauncher; + private System.Windows.Forms.Button btnReset; + private System.Windows.Forms.Button btnExit; } } diff --git a/Microbit/MainMenu.cs b/Microbit/MainMenu.cs index 4e585e3..be78120 100644 --- a/Microbit/MainMenu.cs +++ b/Microbit/MainMenu.cs @@ -1,4 +1,23 @@ -using System; +/*********************************************************************** + * + * Microbits + * Copyright (C) 2019 Alee14 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + ****************************************************************************/ +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -16,5 +35,25 @@ namespace Microbit { InitializeComponent(); } + + private void MainMenu_Load(object sender, EventArgs e) + { + + } + + private void btnExit_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnStart_Click(object sender, EventArgs e) + { + + } + + private void btnReset_Click(object sender, EventArgs e) + { + + } } } diff --git a/Microbit/MainMenu.resx b/Microbit/MainMenu.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Microbit/MainMenu.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/Microbit/Microbit.csproj b/Microbit/Microbit.Main.csproj index e0b35a4..5014e47 100644 --- a/Microbit/Microbit.csproj +++ b/Microbit/Microbit.Main.csproj @@ -6,8 +6,8 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{B026C69C-F934-4C71-A666-5A30CD8E1BE2}</ProjectGuid> <OutputType>WinExe</OutputType> - <RootNamespace>Microbit</RootNamespace> - <AssemblyName>Microbit</AssemblyName> + <RootNamespace>Microbit.Main</RootNamespace> + <AssemblyName>Microbit.Main</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <Deterministic>true</Deterministic> @@ -32,8 +32,26 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Discord.Net.Core, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll</HintPath> + </Reference> + <Reference Include="Discord.Net.Rest, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Rest.1.0.2\lib\net45\Discord.Net.Rest.dll</HintPath> + </Reference> + <Reference Include="Discord.Net.Rpc, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Discord.Net.Rpc.1.0.2\lib\net45\Discord.Net.Rpc.dll</HintPath> + </Reference> + <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> + <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath> + </Reference> <Reference Include="System.Core" /> + <Reference Include="System.Interactive.Async, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL"> + <HintPath>..\packages\System.Interactive.Async.3.1.1\lib\net45\System.Interactive.Async.dll</HintPath> + </Reference> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -53,6 +71,9 @@ </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <EmbeddedResource Include="MainMenu.resx"> + <DependentUpon>MainMenu.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> @@ -61,7 +82,9 @@ <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DependentUpon>Resources.resx</DependentUpon> + <DesignTime>True</DesignTime> </Compile> + <None Include="packages.config" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> diff --git a/Microbit/Program.cs b/Microbit/Program.cs index 72ac533..e2c475b 100644 --- a/Microbit/Program.cs +++ b/Microbit/Program.cs @@ -1,4 +1,23 @@ -using System; +/*********************************************************************** + * + * Microbits + * Copyright (C) 2019 Alee14 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + ****************************************************************************/ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/Microbit/Properties/Resources.Designer.cs b/Microbit/Properties/Resources.Designer.cs index d6a2732..d0f55e2 100644 --- a/Microbit/Properties/Resources.Designer.cs +++ b/Microbit/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace Microbit.Properties -{ - - +namespace Microbit.Main.Properties { + using System; + + /// <summary> /// A strongly-typed resource class, for looking up localized strings, etc. /// </summary> @@ -19,51 +19,43 @@ namespace Microbit.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// <summary> /// Returns the cached ResourceManager instance used by this class. /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microbit.Properties.Resources", typeof(Resources).Assembly); + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microbit.Main.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// <summary> /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Microbit/Properties/Settings.Designer.cs b/Microbit/Properties/Settings.Designer.cs index 052febf..566564d 100644 --- a/Microbit/Properties/Settings.Designer.cs +++ b/Microbit/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace Microbit.Properties -{ - - +namespace Microbit.Main.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Microbit/packages.config b/Microbit/packages.config new file mode 100644 index 0000000..e732a0b --- /dev/null +++ b/Microbit/packages.config @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Discord.Net.Core" version="1.0.2" targetFramework="net45" /> + <package id="Discord.Net.Rest" version="1.0.2" targetFramework="net45" /> + <package id="Discord.Net.Rpc" version="1.0.2" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" /> + <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net45" /> + <package id="System.Interactive.Async" version="3.1.1" targetFramework="net45" /> +</packages>
\ No newline at end of file |
