Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2015-08-24 12:01:03 +03:00
@@ -20,6 +20,10 @@ import com.intellij.util.xmlb.annotations.Attribute;
public class SyntaxHighlighterFactoryEP extends LanguageExtensionPoint<SyntaxHighlighterFactory> {
// For backward compatibility
/**
* @deprecated use "language" attribute instead
*/
@Deprecated
@Attribute("key")
public String key;