From ee2293d2abf27826fa95a3566dc2028d19e7236d Mon Sep 17 00:00:00 2001
From: BinaryConstruct <binaryconstruct@gmail.com>
Date: Sun, 28 Aug 2011 12:51:35 -0500
Subject: [PATCH] 2.0.8.5

---
 TEdit/Shell.xaml   |  2 +-
 TEdit/TEdit.csproj |  1 +
 changelog.txt      | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/TEdit/Shell.xaml b/TEdit/Shell.xaml
index 32677acd..8a6fda2b 100644
--- a/TEdit/Shell.xaml
+++ b/TEdit/Shell.xaml
@@ -1,6 +1,6 @@
 <Window x:Class="TEdit.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:vm="clr-namespace:TEdit.ViewModels" xmlns:views="clr-namespace:TEdit.Views" Title="TEdit 2 - 2.0.8.4"
+        xmlns:vm="clr-namespace:TEdit.ViewModels" xmlns:views="clr-namespace:TEdit.Views" Title="TEdit 2 - 2.0.8.5"
         Height="600" Width="800" TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="Aliased"
         UseLayoutRounding="True" Background="{StaticResource WindowBackgroundBrush}" Foreground="{DynamicResource TextBrush}" Icon="/TEdit;component/Images/tedit.ico">
     <DockPanel Grid.Row="1" HorizontalAlignment="Stretch">
diff --git a/TEdit/TEdit.csproj b/TEdit/TEdit.csproj
index ed0d3c1d..9da783dd 100644
--- a/TEdit/TEdit.csproj
+++ b/TEdit/TEdit.csproj
@@ -273,6 +273,7 @@
   <ItemGroup>
     <Content Include="settings.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
     <Resource Include="Images\tedit.ico" />
     <Resource Include="Images\Overlays\dungeon_marker.png" />
diff --git a/changelog.txt b/changelog.txt
index e643f0f6..8a2f024d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,17 @@
+2011-08-27 Update to settings.xml file closes #105
+2011-08-26 More prep for settings change
+2011-08-26 Creating new settings file in prep for update
+2011-08-22 updating readme
+2011-08-21 Merge pull request #119 from 27sierra/patch-1
+2011-08-21 Edited TEdit/items.txt via GitHub
+2011-08-19 Merge pull request #115 from Kyphis/master
+2011-08-18 Added Thaky's colors
+2011-08-19 Schematics
+2011-08-17 Version updated to 1.0.8.4 (Terraria 1.0.6.1)
+2011-08-17 Compatibility for 1.0.6.1 patch, added tile and wall numbers to hover text
+2011-08-11 Merge remote branch 'origin/master'
+2011-08-11 Merge pull request #106 from 27sierra/patch-1
+2011-08-11 Edited TEdit/items.txt via GitHub
 2011-08-09 refactoring chest/sign hittest
 2011-08-09 updated version, closes #101
 2011-08-09 removed debug code