merged changes because fuck collaboration, apparently

tlandino0 · Nov 20, 2017 · 1947cc9 · 1947cc9
2 parents fd86b24 + fcbfcaa
commit 1947cc9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/HexDeploy/Form1.cs b/HexDeploy/Form1.cs
@@ -7,9 +7,9 @@
 
 namespace HexDeploy
 {
-    public partial class mainform : Form
+    public partial class Form1 : Form
     {
-        public mainform()
+        public Form1()
         {
             InitializeComponent();
         }
@@ -36,11 +36,11 @@ private void packettest()
 
             try
             {
-                IPAddress serverAddr = IPAddress.Parse(IPtextbox.Text);
+                IPAddress serverAddr = IPAddress.Parse(textBox5.Text);
                 try
                 {
                     //gross bit of code here. On the fly conversion.
-                    int new0 = Convert.ToInt32(PortTextbox.Text);
+                    int new0 = Convert.ToInt32(textBox3.Text);
                     //sets the endpoint with user input from a textbox
                     IPEndPoint ep0 = new IPEndPoint(serverAddr, new0);
                     //test message

diff --git a/HexDeploy/HexDeploy.csproj b/HexDeploy/HexDeploy.csproj
@@ -80,6 +80,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="chatLog.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/HexDeploy/chatLog.xml b/HexDeploy/chatLog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<history>
+  <section>
+    <header>
+     <to> </to>
+    <from> </from> 
+    </header>
+
+    <body>
+      <msg> </msg>
+    </body>
+
+  </section>
+</history>