# HG changeset patch # User Chris Cannam # Date 1375204692 -3600 # Node ID e660c51ec81adfaee7a3fa48ab8d1467f467d3d2 # Parent 3aeb7cfadcbabcb861dabed801a7b539584de539# Parent f14e40945862b29ffb0278e203f37018fdf33d4b Merge diff -r 3aeb7cfadcba -r e660c51ec81a .hgsubstate --- a/.hgsubstate Mon Jul 29 22:56:48 2013 +0100 +++ b/.hgsubstate Tue Jul 30 18:18:12 2013 +0100 @@ -1,5 +1,5 @@ 236814e07bd07473958c1ff89103124536a0c3c8 dataquay 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp -a1bb2989013dc380e3baf6b6e9704520f62b3bc0 svcore +fcee7e040ab49c70b5a90a6c34d91335de981d62 svcore 0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui diff -r 3aeb7cfadcba -r e660c51ec81a .hgtags --- a/.hgtags Mon Jul 29 22:56:48 2013 +0100 +++ b/.hgtags Tue Jul 30 18:18:12 2013 +0100 @@ -33,3 +33,5 @@ 0757db4b5d103a950512d218374060ab392930b0 sv_v2.1 deabb09d994be070f7cccdd52c23351746427f92 sv_v2.1 ac16e50930326a4826b5813a6cae58b81c721044 sv_v2.2 +ac16e50930326a4826b5813a6cae58b81c721044 sv_v2.2 +29a97099b6473aa14251ec6392eb696cad4a6431 sv_v2.2