diff .hgsubstate @ 1082:b2c45b831ea8 3.0-integration

Merge from default branch
author Chris Cannam
date Wed, 18 Nov 2015 12:08:33 +0000
parents b0f6dce4eab0 6a8ed8736b47
children 224a6f55445d
line wrap: on
line diff
--- a/.hgsubstate	Tue Oct 20 09:14:24 2015 +0100
+++ b/.hgsubstate	Wed Nov 18 12:08:33 2015 +0000
@@ -5,5 +5,5 @@
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 39e94df71d24b92f30f8215cb542d6e481e42281 svapp
-f8604a7c46606d2c09d03f4124b01908a0a5e373 svcore
-2937929ea6dcb27d8c5ad6e3d1636f12f30c002f svgui
+1309b66eff5372e435ebb12b8629b60221548fe4 svcore
+7242fe160c19015cf79440223b2f998236ea205f svgui