projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb4c1af
fdee8bc
)
Merge remote-tracking branch 'origin/master'
author
Ekaterina Tuzova
<Ekaterina.Tuzova@jetbrains.com>
Wed, 22 Jan 2014 09:22:19 +0000
(13:22 +0400)
committer
Ekaterina Tuzova
<Ekaterina.Tuzova@jetbrains.com>
Wed, 22 Jan 2014 09:22:19 +0000
(13:22 +0400)
Conflicts:
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java
Trivial merge