# HG changeset patch # User Chris Cannam # Date 1411993670 -3600 # Node ID 260024e62b6b2be94f63c25395bc8e8d141862e5 # Parent ff52a5b766f7717d5af5b61459e0553f7f622a53# Parent 6ed771ba65f4d55d1e96f6c494e156ed4f5ab04a Merge from branch 2.4-stable diff -r ff52a5b766f7 -r 260024e62b6b .hgsubstate --- a/.hgsubstate Wed Sep 24 18:55:37 2014 +0100 +++ b/.hgsubstate Mon Sep 29 13:27:50 2014 +0100 @@ -1,5 +1,5 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds -49d5e885f58e6b572c87b001e073fcd40875c1b3 svapp -f073d924a7c3153ab822a4a9f4522467c85af0db svcore -7c75fae514091546a8d6be704214f97bcfea443b svgui +7b2dd0d4c366057ce25547a4015f3a76981abedc svapp +e8e6c4e7437bf7d1a9a5bf937b53d20de99fdf89 svcore +3ca3b8fbbceee7a49a268d054e8ad28a171b940d svgui