projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3b88d3
da1579b
)
Merge branch 'master' into new-merge
author
Aleksey Pivovarov
<AMPivovarov@gmail.com>
Wed, 19 Aug 2015 11:07:35 +0000
(14:07 +0300)
committer
Aleksey Pivovarov
<AMPivovarov@gmail.com>
Wed, 19 Aug 2015 11:07:35 +0000
(14:07 +0300)
1
2
platform/platform-resources-en/src/messages/ActionsBundle.properties
patch
|
diff1
|
diff2
|
blob
|
history
platform/platform-resources/src/META-INF/PlatformExtensions.xml
patch
|
diff1
|
diff2
|
blob
|
history
platform/platform-resources/src/idea/PlatformActions.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/platform-resources-en/src/messages/ActionsBundle.properties
Simple merge
diff --cc
platform/platform-resources/src/META-INF/PlatformExtensions.xml
Simple merge
diff --cc
platform/platform-resources/src/idea/PlatformActions.xml
Simple merge
projects / idea / community.git / commitdiff