diff .hgsubstate @ 1007:8d45d6412ca6 3.0-integration

Merge from branch osx-retina
author Chris Cannam
date Fri, 26 Jun 2015 14:18:18 +0100
parents 8be8dc3a0873 0359493998b8
children ab244c0074ba
line wrap: on
line diff
--- a/.hgsubstate	Fri Jun 26 14:17:43 2015 +0100
+++ b/.hgsubstate	Fri Jun 26 14:18:18 2015 +0100
@@ -1,4 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
+845471c833a182376747b44a3ca28181bbdb3c93 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 83370e830c956be0fc4a7d9b5c30761b6ffb7613 svapp
 ee0aff1d0743680befe36e5627d31c019778d0b0 svcore