changeset 1030:afe496c595e1 3.0-integration

Merge from default branch
author Chris Cannam
date Tue, 07 Jul 2015 17:39:06 +0100
parents 1b7c6db542da (current diff) 14e312cf8e95 (diff)
children 7b2f70bcebe1 0f46daf55706
files .hgsubstate
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Jul 01 17:43:05 2015 +0100
+++ b/.hgsubstate	Tue Jul 07 17:39:06 2015 +0100
@@ -2,5 +2,5 @@
 06ed2d275a956fd1224376f74dfe170c19d3b2c2 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 1b4e5a567d5819afabbf4ec79647cf6e608e019b svapp
-4d7de68707c8f1b47695f65c3a95eba4557de6aa svcore
-2adca8f05583809e64cbb1486ab2f58bff49c784 svgui
+e80abd6599224bd83dd96366c26a87b1b7175bd6 svcore
+b0662a3c4679c651616f02551d6173c318136a9c svgui