Merge branch 'emmet'
authorAlexander Zolotov <Alexander.Zolotov@jetbrains.com>
Tue, 5 Feb 2013 12:07:53 +0000 (16:07 +0400)
committerAlexander Zolotov <Alexander.Zolotov@jetbrains.com>
Tue, 5 Feb 2013 12:07:53 +0000 (16:07 +0400)
commit0364879eeb821ee5c709e6d4242eb4fbf53d45e7
tree8eb76d8543d164fff73055b4f5f9b51ac52cf050
parent3baf3bac7d133592a79d1446d02486245f68ea07
parentadda578ba757ad8bf707124171ba1a718c9e0586
Merge branch 'emmet'
platform/platform-resources/src/META-INF/XmlPlugin.xml
xml/impl/src/com/intellij/codeInsight/template/XslTextContextType.java