Merge branch 'db/javac-ast'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:05:41 +0000 (19:05 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 16:05:41 +0000 (19:05 +0300)
commit1bc12672eb9ac84460d02d8aa3307cd5cde7c321
treeeed6772ea58020d0de35e4232bbf923a1b869e5d
parent33a22cef22e8b8f5bf0731c362f1ad954870fb4a
parentc0453adfe8be1978e9bb1c874a974dd62cbfbac7
Merge branch 'db/javac-ast'

# Conflicts:
# platform/util/resources/misc/registry.properties
build/scripts/layouts.gant
java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/util/resources/misc/registry.properties
resources/src/META-INF/IdeaPlugin.xml
resources/src/idea/RichPlatformPlugin.xml