git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ed5b94 9b717f5)
Merge branch 'bug/JAL-2358phantomChimera' into spikes/mungo
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:54:47 +0000 (09:54 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:54:47 +0000 (09:54 +0000)
Conflicts:
src/jalview/gui/ChimeraViewFrame.java

1  2 
src/jalview/gui/ChimeraViewFrame.java patch | diff1 | diff2 | blob | history
src/jalview/structure/StructureSelectionManager.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/ChimeraViewFrame.java
index 4c38898,7cf3bfc..bc247ca
--- 1/src/jalview/gui/ChimeraViewFrame.java
--- 2/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@@ -71,8 -66,6 +71,7 @@@ import javax.swing.JCheckBoxMenuItem
  import javax.swing.JColorChooser;
  import javax.swing.JInternalFrame;
  import javax.swing.JMenu;
 +import javax.swing.JMenuItem;
- import javax.swing.JOptionPane;
  import javax.swing.event.InternalFrameAdapter;
  import javax.swing.event.InternalFrameEvent;
  import javax.swing.event.MenuEvent;