From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Sun, 7 Jul 2013 12:26:17 +0000 (+0100)
Subject: Merge branch 'JalScape/JAL-1332' of https://source.jalview.org/git/jalview into JalSc... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FJalScape%2FJAL-1332;hp=738cb8eba9f66dd726fd69e02e6f7c76306de2e8;p=jalview.git

Merge branch 'JalScape/JAL-1332' of https://source.jalview.org/git/jalview into JalScape/JAL-1332
---

diff --git a/README.JalScape b/README.JalScape
new file mode 100644
index 0000000..28dd34c
--- /dev/null
+++ b/README.JalScape
@@ -0,0 +1,4 @@
+The JalScape branch is a patched version of Jalview that was developed
+by Jim Procter and Scooter Morris in June 2013 to create the first
+version of the cytoscape plugin, JalScape, that allows Cytoscape users
+to access Jalview.