diff .hgsubstate @ 346:65907d91f328

mergewq
author matthiasm
date Mon, 16 Jun 2014 12:25:11 +0100
parents f3a9e4abec1b 80f2cd8a30f7
children fc0c4cfad044
line wrap: on
line diff
--- a/.hgsubstate	Mon Jun 16 12:24:52 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 12:25:11 2014 +0100
@@ -3,5 +3,5 @@
 062f0e49187789937b6162d2904b1af20872ed5e pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
-85879408f6657f4076d73839d590c9fb80b78e73 svcore
-d6b79166ae0d6dcf0ed55aba08f50fdfcd229647 svgui
+3efc20c59a947a137ed7fc715b2a3b0de6c02200 svcore
+8be221f1831388b523b88a74fb2e3d30d2d23291 svgui