projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7a57c8 3fd9a21)
Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 17 Aug 2015 12:43:41 +0000 (14:43 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 17 Aug 2015 12:43:41 +0000 (14:43 +0200)
Conflicts:
platform/platform-api/src/com/intellij/ui/TableScrollingUtil.java


Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.