projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
395f16a
5aeee8a
)
Merge remote-tracking branch 'origin/master' into develar/is
author
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Wed, 13 Jul 2016 05:39:25 +0000
(07:39 +0200)
committer
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Wed, 13 Jul 2016 05:39:25 +0000
(07:39 +0200)
1
2
platform/util/resources/misc/registry.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/util/resources/misc/registry.properties
Simple merge