git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-JS/develop' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
UserDefinedColours.java
diff --git
a/src/jalview/appletgui/UserDefinedColours.java
b/src/jalview/appletgui/UserDefinedColours.java
index
6831a73
..
febe5f8
100644
(file)
--- a/
src/jalview/appletgui/UserDefinedColours.java
+++ b/
src/jalview/appletgui/UserDefinedColours.java
@@
-70,7
+70,7
@@
public class UserDefinedColours extends Panel
Frame frame;
Frame frame;
- MCview.AppletPDBCanvas pdbcanvas;
+ mc_view.AppletPDBCanvas pdbcanvas;
AppletJmol jmol;
AppletJmol jmol;
@@
-107,7
+107,7
@@
public class UserDefinedColours extends Panel
init();
}
init();
}
- public UserDefinedColours(MCview.AppletPDBCanvas pdb)
+ public UserDefinedColours(mc_view.AppletPDBCanvas pdb)
{
this.pdbcanvas = pdb;
init();
{
this.pdbcanvas = pdb;
init();