Merge branch 'master' into vplyashkun/clang_tidy_multifile_fixes
authorVladimir Plyashkun <vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000 (16:03 +0300)
committerVladimir Plyashkun <vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000 (16:03 +0300)
commit7292081fe66839540bbfbfd784a9e836236fc852
tree2c93d0080a95e598e8c156e1483b5502052f9bac
parent6abc02777fb6b235ace94418cb00d73ae679e354
parent6805a558af459721b45c9459ee20768039665513
Merge branch 'master' into vplyashkun/clang_tidy_multifile_fixes

# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java
platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java