summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xrelease2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ade2ea92..076a7ebfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-10 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash when trying to use a DCI name when there
+ is no soundtrack (yet) (reported by Wolfgang Woehl).
+
2012-11-07 Carl Hetherington <cth@carlh.net>
* Version 0.56 released.
diff --git a/release b/release
index 29da203c1..ad5bdbbf1 100755
--- a/release
+++ b/release
@@ -52,6 +52,8 @@ def append_to_changelog(version):
f.write('%d-%02d-%02d Carl Hetherington <cth@carlh.net>\n\n\t* Version %s released.\n\n' % (now.year, now.month, now.day, version))
f.write(c)
+command("git checkout master")
+
release_version_string = rewrite_wscript(release_version)
append_to_changelog(release_version_string)