changeset 1184:e5a1d815f331 3.0-integration

Merge from the default branch
author Chris Cannam
date Thu, 21 Apr 2016 15:29:30 +0100 (2016-04-21)
parents a1f410f895d3 (current diff) 79f7af8873c9 (diff)
children 69c84a66727b
files data/fileio/test/test.pro system/System.cpp
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)); }
 
+