# HG changeset patch
# User Chris Cannam
# Date 1412196355 -3600
# Node ID 158d059d9a4cfec88aee9b2ed8b81e91c3d380ed
# Parent  260024e62b6b2be94f63c25395bc8e8d141862e5# Parent  28831a538cb5cd176e01e84eadfb54e850f04add
Merge from branch 2.4-stable

diff -r 260024e62b6b -r 158d059d9a4c .hgsubstate
--- a/.hgsubstate	Mon Sep 29 13:27:50 2014 +0100
+++ b/.hgsubstate	Wed Oct 01 21:45:55 2014 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
 7b2dd0d4c366057ce25547a4015f3a76981abedc svapp
-e8e6c4e7437bf7d1a9a5bf937b53d20de99fdf89 svcore
+58c4d69b4dd8ff05908097ea2d5c520067b12aa4 svcore
 3ca3b8fbbceee7a49a268d054e8ad28a171b940d svgui
diff -r 260024e62b6b -r 158d059d9a4c .hgtags
--- a/.hgtags	Mon Sep 29 13:27:50 2014 +0100
+++ b/.hgtags	Wed Oct 01 21:45:55 2014 +0100
@@ -47,3 +47,4 @@
 bf06f4311ec0af43f93a15489a757955e07597cd sv_v2.3
 cfbea29fae640aed5c8b7265d6806df823f34fef sv_v2.4
 8215909b74d2c58be28ce128d40fbc1645bc0d6e sv_v2.4_linux_deploy
+2868d5abf1a3baa37099c1b5d7e984bf8bb8177a sv_v2.4.1
diff -r 260024e62b6b -r 158d059d9a4c CHANGELOG
--- a/CHANGELOG	Mon Sep 29 13:27:50 2014 +0100
+++ b/CHANGELOG	Wed Oct 01 21:45:55 2014 +0100
@@ -1,3 +1,6 @@
+Changes in Sonic Visualiser 2.4.1 since the previous release 2.4:
+
+ - Fix a crash when rendering certain colour 3d plot layers
 
 Changes in Sonic Visualiser 2.4 since the previous release 2.3:
 
diff -r 260024e62b6b -r 158d059d9a4c version.h
--- a/version.h	Mon Sep 29 13:27:50 2014 +0100
+++ b/version.h	Wed Oct 01 21:45:55 2014 +0100
@@ -1,1 +1,1 @@
-#define SV_VERSION "2.4"
+#define SV_VERSION "2.4.1"