From bfdf486a1ee388863f68f7272c7edce10417f854 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Sat, 8 Sep 2012 15:36:35 +1000
Subject: [PATCH] updated changelog, committing dme as well just in case

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 baystation12.dme    | 1 -
 html/changelog.html | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index 60ee3ddf86e..df3fb4f9143 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -253,7 +253,6 @@
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
 #define FILE_DIR "maps/RandomZLevels"
-#define FILE_DIR "music"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
diff --git a/html/changelog.html b/html/changelog.html
index 6d519ffb700..7e854ea4f20 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -60,10 +60,10 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 
 <div class="commit sansserif">
-	<h2 class="date">September 6, 2012</h2>
+	<h2 class="date">September 8, 2012</h2>
 	<h3 class="author">Cael_Aislinn updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">Merge current BS12 code with /tg/station's rev4633. See <a href="https://code.google.com/p/tgstation13/source/list">https://code.google.com/p/tgstation13/source/list</a> for tg's changelog. 
+		<li class="rscadd">Merge current BS12 code with /tg/station's rev4649. See <a href="https://code.google.com/p/tgstation13/source/list">https://code.google.com/p/tgstation13/source/list</a> for tg's changelog. 
 	</ul>
 </div>
 
@@ -73,7 +73,7 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<ul class="changes bgimages16">
 		<li class="rscadd">The server is updating with tgcode. This is a significant update, and there will likely be several bugs coming with it. 
 		See <a href="https://github.com/Baystation12/Baystation12/pull/1671">https://github.com/Baystation12/Baystation12/pull/1671</a> for more information.</li>
-		<li class="rscadd">The server is now running tgstation3.0.9.dmm. The station layout is functionally the same, but with significant additions from tg. Hopefully, the Antiqua will be ready soon.</li>
+		<li class="rscadd">The server is now running tgstation2.0.9.dmm. The station layout is functionally the same, but with significant additions from tg. Hopefully, the Antiqua will be ready soon.</li>
 		<li class="bugfix">Please report all bugs immediately, both in OOC and by making an issue at: <a href="https://github.com/Baystation12/Baystation12/issues/new">https://github.com/Baystation12/Baystation12/issues/new</a></li>
 	</ul>
 </div>