Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yann Cébron
2015-03-27 11:21:42 +01:00
@@ -349,7 +349,7 @@ public class LineStatusTrackerDrawing {
}
}
@NotNull
@Nullable
private static Color getDiffColor(@NotNull Range range) {
final EditorColorsScheme globalScheme = EditorColorsManager.getInstance().getGlobalScheme();
switch (range.getType()) {