# HG changeset patch
# User Chris Cannam
# Date 1461248970 -3600
# Node ID e5a1d815f331275aae137af37e13766c69814e5c
# Parent  a1f410f895d3edf8008067a57d86f92b5da278de# Parent  79f7af8873c9049b112c8f80a4f3c4d457fd71a6
Merge from the default branch

diff -r a1f410f895d3 -r e5a1d815f331 system/System.cpp
--- a/system/System.cpp	Fri Apr 15 16:26:15 2016 +0100
+++ b/system/System.cpp	Thu Apr 21 15:29:30 2016 +0100
@@ -325,3 +325,4 @@
 double princarg(double a) { return mod(a + M_PI, -2 * M_PI) + M_PI; }
 float princargf(float a) { return float(princarg(a)); }
 
+