From dfc6cc30fb0610d81214fee71cc68ebcbf73ef88 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Wed, 18 Nov 2015 06:51:17 +0000
Subject: [PATCH] Updated CHANGELOG

---
 CHANGELOG | 13 +++++++++++++
 makefile  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9016185..ac586dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,18 @@
 Changelog
 
+0.3
+
+	* Added a few new missions.
+	* Added new stats.
+	* Flash health and shield bars when under 25%.
+	* Show warning message and play sound when a missile is launched, targetting the player.
+	* Added Boost and ECM abilities for player.
+	* Fixed a bug which messed up the config file saving.
+	* Added civilian rescue missions.
+	* New craft: Tug and Shuttle.
+	* Toned down the AI a bit, to make the battle less difficult and frantic.
+	* Now showing mission data on the right-hand side of the screen, in place of the target armour and shield.
+
 0.2
 
 	* Added Firefly, Nymph, Hyena, and Leopard fighters.
diff --git a/makefile b/makefile
index 6eab9ee..d6f4a38 100644
--- a/makefile
+++ b/makefile
@@ -36,7 +36,7 @@ OBJS += testMission.o textures.o text.o title.o transition.o triggers.o
 OBJS += util.o
 OBJS += waypoints.o widgets.o
 
-DIST_FILES = data gfx manual music sound src LICENSE makefile README.md
+DIST_FILES = data gfx manual music sound src LICENSE makefile README.md CHANGELOG
 
 # top-level rule to create the program.
 all: $(PROG)
@@ -54,7 +54,7 @@ dist:
 	$(RM) -rf $(PROG)-$(VERSION)
 	mkdir $(PROG)-$(VERSION)
 	cp -r $(DIST_FILES) $(PROG)-$(VERSION)
-	git log --oneline master..develop >$(PROG)-$(VERSION)/CHANGELOG
+	git log --oneline --decorate >$(PROG)-$(VERSION)/CHANGELOG.raw
 	tar czf $(PROG)-$(VERSION).$(REVISION)-src.tar.gz $(PROG)-$(VERSION)
 	mkdir -p dist
 	mv $(PROG)-$(VERSION).$(REVISION)-src.tar.gz dist