From eb81128fe3c5363a680f28d476d24646aff2437e Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Sun, 6 Dec 2015 11:28:26 +0100
Subject: [PATCH] Changelog update.

---
 html/changelog.html                   |  7 +++++
 html/changelogs/.all_changelog.yml    |  4 +++
 html/changelogs/Hubblenaut-master.yml | 37 ---------------------------
 3 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/Hubblenaut-master.yml

diff --git a/html/changelog.html b/html/changelog.html
index da0c373d463..3b3bb449ae9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,13 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">06 December 2015</h2>
+			<h3 class="author">Hubblenaut updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Welding a broken camera will use the correct icon.</li>
+				<li class="tweak">Camera assemblies remember their tag and network from previous usage.</li>
+			</ul>
+
 			<h2 class="date">22 November 2015</h2>
 			<h3 class="author">neersighted updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 49b16be0a5c..cd8d552d8ef 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2040,3 +2040,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   neersighted:
   - bugfix: Laptop Vendors now accept ID Containers (PDA, Wallet, etc).
   - bugfix: Personal Lockers now accept ID Containers (PDA, Wallet, etc).
+2015-12-06:
+  Hubblenaut:
+  - bugfix: Welding a broken camera will use the correct icon.
+  - tweak: Camera assemblies remember their tag and network from previous usage.
diff --git a/html/changelogs/Hubblenaut-master.yml b/html/changelogs/Hubblenaut-master.yml
deleted file mode 100644
index fca68d64515..00000000000
--- a/html/changelogs/Hubblenaut-master.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Hubblenaut
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Welding a broken camera will use the correct icon."
-  - tweak: "Camera assemblies remember their tag and network from previous usage."