git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ebfeaa)
JAL-2500 JAL-2365 lightGray changed to lightgray for backwards
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Aug 2017 11:47:18 +0000 (13:47 +0200)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Aug 2017 11:47:18 +0000 (13:47 +0200)
compatibility!

examples/exampleFeatures.txt patch | blob | history
utils/eclipse/JalviewCodeStyle.xml patch | blob | history

diff --git a/examples/exampleFeatures.txt b/examples/exampleFeatures.txt
index 5b65810..9e65534 100755 (executable)
--- a/examples/exampleFeatures.txt
+++ b/examples/exampleFeatures.txt
@@ -1,5 +1,5 @@
 ST-TURN-IIL    blue
-GAMMA-TURN-CLASSIC     gray
+GAMMA-TURN-CLASSIC     lightgray
 BETA-TURN-IR   9a6a94
 BETA-TURN-IL   d6a6ca
 BETA-BULGE     1dc451
diff --git a/utils/eclipse/JalviewCodeStyle.xml b/utils/eclipse/JalviewCodeStyle.xml
index 452afa5..b84b083 100644 (file)
--- a/utils/eclipse/JalviewCodeStyle.xml
+++ b/utils/eclipse/JalviewCodeStyle.xml
@@ -302,6 +302,6 @@
 <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
 </profile>
 </profiles>