# HG changeset patch
# User Chris Cannam
# Date 1318327727 -3600
# Node ID 14bec93c9f9cb62bad8b12b8d365b1ab1208da46
# Parent  556988df46a0baa8fc9584bd0e723a85947305cb# Parent  0916db73089d71ec622670198a212cf636fa1563
Merge

diff -r 556988df46a0 -r 14bec93c9f9c download.html
--- a/download.html	Tue Oct 11 11:08:18 2011 +0100
+++ b/download.html	Tue Oct 11 11:08:47 2011 +0100
@@ -16,7 +16,9 @@
                       <div id="primary">
               <ul class="links"><li class="first"><a href="index.html" title="">Home</a></li>
 <li><a href="http://code.soundsoftware.ac.uk/projects/easyhg" title="Project page">Project page</a></li>
+<li><a href="http://bitbucket.org/cannam/easyhg" title="BitBucket">BitBucket</a></li>
 <li><a href="http://code.soundsoftware.ac.uk/projects/easyhg/wiki/Screenshots" title="Screenshots">Screenshots</a></li>
+<li><a href="videos.html" title="Videos">Videos</a></li>
 <li class=last>Download</li>
 </ul>            </div>
         </div></div>
@@ -25,15 +27,15 @@
 <div id="download-windows">
 <h2>Windows</h2>
 
-<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/114/EasyMercurial-0.9.7-Setup.exe">Download EasyMercurial Windows installer</a></big></p>
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/167/EasyMercurial-1.0.1-Setup.exe">Download EasyMercurial Windows installer</a></big></p>
 
-<p>The Mercurial executable and KDiff3 diff/merge application are included.  Just install and run.  (Thanks to Joachim Eibl for <a href="http://kdiff3.sourceforge.net/">KDiff3</a> and the <a href="http://tortoisehg.bitbucket.org/">TortoiseHg project</a> for the bundling mechanism.)</p>
+<p>The Mercurial executable and KDiff3 diff/merge application are included.  Just install and run.  (Thanks to Joachim Eibl for <a href="http://kdiff3.sourceforge.net/">KDiff3</a> and to the <a href="http://tortoisehg.bitbucket.org/">TortoiseHg project</a> for the bundling mechanism.)</p>
 
 </div>
 <div id="download-mac">
 <h2>Mac OS/X</h2>
 
-<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/119/EasyMercurial-0.9.7.dmg">Download EasyMercurial package for Mac OS/X</a></big></p>
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/151/EasyMercurial-1.0.dmg">Download EasyMercurial package for Mac OS/X</a></big></p>
 
 <p>Mercurial itself is not included in this package.<br><a href="http://mercurial.selenic.com/" target="_new">Download and install it</a> before you run EasyMercurial.</p>
 
@@ -43,7 +45,13 @@
 <div id="download-linux">
 <h2>Linux</h2>
 
-<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/120/EasyMercurial-0.9.7-linux-i386.tar.gz">Download EasyMercurial for 32-bit Linux</a><br>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/121/EasyMercurial-0.9.7-linux-x86_64.tar.gz">Download EasyMercurial for 64-bit Linux</a></big></p>
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/148/easymercurial_1.0cc-2_i386.deb">Download EasyMercurial for 32-bit Ubuntu/Debian</a><br>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/149/easymercurial_1.0cc-2_amd64.deb">Download EasyMercurial for 64-bit Ubuntu/Debian</a></big></p>
 
-First install the prerequisites using your distribution's package manager. These are Mercurial itself, the Qt4 and PyQt4 toolkits, and KDiff3. In Ubuntu the packages you need are: <b><code>mercurial python-qt4 python-crypto kdiff3</code></b>.
+<p>You should only have to install the relevant package: and all the necessary dependencies should be added by your package manager.</p>
 
+</div>
+<div id="download-source">
+<h2>Source code</h2>
+
+<p><big>&#187; <a href="http://code.soundsoftware.ac.uk/attachments/download/150/EasyMercurial-1.0-src.tar.gz">Download EasyMercurial source code</a>
+</div>
diff -r 556988df46a0 -r 14bec93c9f9c index.html
--- a/index.html	Tue Oct 11 11:08:18 2011 +0100
+++ b/index.html	Tue Oct 11 11:08:47 2011 +0100
@@ -16,7 +16,9 @@
                       <div id="primary">
               <ul class="links"><li class="first">Home</li>
 <li><a href="http://code.soundsoftware.ac.uk/projects/easyhg" title="Project page">Project page</a></li>
+<li><a href="http://bitbucket.org/cannam/easyhg" title="BitBucket">BitBucket</a></li>
 <li><a href="http://code.soundsoftware.ac.uk/projects/easyhg/wiki/Screenshots" title="Screenshots">Screenshots</a></li>
+<li><a href="videos.html" title="Videos">Videos</a></li>
 <li class=last><a href="download.html" title="Download">Download</a></li>
 </ul>            </div>
         </div></div>
@@ -45,7 +47,7 @@
 <div id="footer">
 <div id="footer-content">
 <div style="float:right"><a href="http://soundsoftware.ac.uk/"><img src="http://code.soundsoftware.ac.uk/attachments/19/soundsoftware-logo-title-only-transparent.png" width=223 height=17></a></div>
-Development carried out at the Centre for Digital Music, Queen Mary University of London.  Funded by grant EP/H043101/1 of the UK Engineering and Physical Sciences Research Council.
+Development carried out at the Centre for Digital Music, Queen Mary University of London.  Funded by grant EP/H043101/1 of the UK Engineering and Physical Sciences Research Council.  Thanks to Jari Korhonen for HgExplorer on which this work is based.
 </div>
 </div>
 
diff -r 556988df46a0 -r 14bec93c9f9c videos.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videos.html	Tue Oct 11 11:08:47 2011 +0100
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>EasyMercurial</title>
+    <link rel="stylesheet" href="screen.css" media="screen"/>
+    <meta name="robots" content="index">
+    <meta name="description" content="">
+  </head>
+<body>
+
+<div id="logo-title"><h1 id="site-name">EasyMercurial</h1></div>
+          
+    <div id="navbar"><div id="navbar-inner">
+          <a name="navigation" id="navigation"></a>
+                      <div id="primary">
+              <ul class="links"><li class="first"><a href="index.html" title="">Home</a></li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg" title="Project page">Project page</a></li>
+<li><a href="http://bitbucket.org/cannam/easyhg" title="BitBucket">BitBucket</a></li>
+<li><a href="http://code.soundsoftware.ac.uk/projects/easyhg/wiki/Screenshots" title="Screenshots">Screenshots</a></li>
+<li>Videos</li>
+<li class=last><a href="download.html">Download</a></li>
+</ul>            </div>
+        </div></div>
+      
+<div id="page">
+
+<table border=0 cellspacing=8 cellpadding=8>
+
+<tr>
+<td valign=top>
+<object width="400" height="300"><param name="allowfullscreen"
+value="true" /><param name="allowscriptaccess" value="always" /><param
+name="movie"
+value="http://vimeo.com/moogaloop.swf?clip_id=29779278&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ef6a35&amp;fullscreen=1"
+/><embed
+src="http://vimeo.com/moogaloop.swf?clip_id=29779278&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ef6a35&amp;fullscreen=1"
+type="application/x-shockwave-flash" allowfullscreen="true"
+allowscriptaccess="always" width="400" height="300"></embed></object>
+</td>
+<td valign=top><b>Opening a remote repository</b><p>
+How to get from a remote Mercurial repository URL to a folder on your local computer, using EasyMercurial.
+<br><br>
+</td>
+</tr>
+
+<tr>
+<td valign=top>
+<object width="400" height="300"><param name="allowfullscreen"
+value="true" /><param name="allowscriptaccess" value="always" /><param
+name="movie"
+value="http://vimeo.com/moogaloop.swf?clip_id=29779641&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ef6a35&amp;fullscreen=1"
+/><embed
+src="http://vimeo.com/moogaloop.swf?clip_id=29779641&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=ef6a35&amp;fullscreen=1"
+type="application/x-shockwave-flash" allowfullscreen="true"
+allowscriptaccess="always" width="400" height="300"></embed></object>
+</td>
+<td valign=top><b>Putting a project under version control</b><p>
+How to start using version control for an existing code project, with EasyMercurial.
+<br><br>
+</td>
+</tr>
+
+</div>