projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96a2eac
2e509d6
)
Merge branch 'sdombrovsky/virtual_lines'
author
Stanislav Dombrovsky
<stanislav.dombrovsky@jetbrains.com>
Tue, 18 Apr 2017 12:16:49 +0000
(15:16 +0300)
committer
Stanislav Dombrovsky
<stanislav.dombrovsky@jetbrains.com>
Tue, 18 Apr 2017 12:16:49 +0000
(15:16 +0300)
1
2
platform/util/resources/misc/registry.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/util/resources/misc/registry.properties
Simple merge