[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / aether-dependency-resolver / intellij.java.aetherDependencyResolver.iml
2020-06-16 Nikolay Chashnikov[IntelliJ project configuration] explicitly set languag...
2020-06-12 Andrei KuznetsovMerge Android Studio 4.0 (aosp/studio-master-dev)
2020-05-12 Dmitriy.PanovSpace plugin merged
2019-12-15 Artem MukhinMerge amukhin/analyze-stacktrace-action-fix into master
2019-11-14 Nikita SkvortsovIntroduce commons-lang3:3.9 as project library.
2019-01-17 Alexander LuyblinskyMerge branch 'aliublinskii/OC-18215-fold-localhost...
2019-01-14 peterRevert "IDEA-201136 Update velocity library to 2.0"
2019-01-02 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2019-01-02 peterIDEA-201136 Update velocity library to 2.0
2018-10-22 Dmitry TrofimovMerge branch 'quote-vars' of https://github.com/rohanjo...
2018-10-22 Dmitry TrofimovMerge branch 'terminalProjectEnv' of https://github...
2018-10-01 Dmitry TrofimovMerge branch 'traff/open_or_attach'
2018-09-11 Vladimir PlyashkunMerge branch 'master' into vplyashkun/clang_tidy_multif...
2018-09-10 Eldar AbusalimovMerge remote-tracking branch 'origin/master' into eldar...
2018-09-10 Alexander LuyblinskyMerge branch 'master' into aliublinskii/OC-17089-debug...
2018-08-28 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2018-08-16 Egor ZhdanMerge remote-tracking branch 'origin/master' into egorz... clion/183.1610 clion/183.1615 clion/183.1628
2018-08-16 Vasily RomanikhinMerge branch 'master' into vromanik/remote_master
2018-08-16 nikIDEA project configuration: reuse 'maven-model' project...
2018-06-29 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2018-06-23 BehrangMerge branch 'master' into behrangsa-fish-config
2018-06-07 Dmitry Avdeevmerging Android Studio 3.1.2
2018-05-28 alexey.afanasievMerge branch 'groovy_graph_inference'
2018-05-22 Semyon KoltonMerge branch 'master' into skolton/compilation_database clion/182.2647 clion/182.2678
2018-05-21 Mikhail SokolovMerge branch 'master' of git.labs.intellij.net:idea...
2018-05-17 nikIDEA project configuration: replace annotation modules...
2018-05-07 Vitaliy.BibaevMerge remote-tracking branch 'stats-collector/master...
2018-04-24 Dmitry BatkovichMerge branch 'db/implicit-to-string'
2018-04-17 Vladislav.SorokaMerge branch 'master' into vsoroka/gradle_native
2018-04-03 Daniil OvchinnikovMerge branch 'daniil/meta-language-extension'
2018-04-02 Vassiliy.KudryashovMerge remote-tracking branch 'origin/master'
2018-04-02 niktests: add test for evaluation of classpath for java...
2018-04-02 Vasily RomanikhinWSL refactoring: manual merge into master
2018-03-31 Daniil OvchinnikovMerge branch 'daniil/name-suggestions'
2018-03-31 Daniil OvchinnikovMerge branch 'daniil/ast-loading-filter-2'
2018-03-30 Viktor ShatrovMerge branch 'vshatrov/js-debugger-coverage'
2018-03-30 nikIDEA project configuration: aether and maven-aether...
2018-02-15 Alexey UtkinMerge remote-tracking branch 'origin/uta/lexerIndent'
2018-01-31 Roman ShevchenkoMerge PR #709 (https://github.com/JetBrains/intellij...
2018-01-26 Stanislav DombrovskyMerge remote-tracking branch 'origin/sdombrovsky/dmg_ba...
2018-01-26 Florian KistnerMerge remote-tracking branch 'origin/master' into flori...
2018-01-26 Vasily RomanikhinMerge branch 'vromanik/process_handler_interface' into...
2018-01-25 Dennis UshakovMerge remote-tracking branch 'origin/master'
2018-01-25 nikIDEA project configuration: the great module rename
2018-01-25 nikIDEA project configuration: the great module rename