projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 999fcb6 c8770ea)
Merge merge tool fixes for 121.
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:32:26 +0000 (19:32 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:32:26 +0000 (19:32 +0400)

Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.