projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
82f1c26
e9902fc
)
Merge branch 'new-flex-config'
author
kirill.safonov
<kirill.safonov@jetbrains.com>
Mon, 30 Jan 2012 15:35:36 +0000
(19:35 +0400)
committer
kirill.safonov
<kirill.safonov@jetbrains.com>
Mon, 30 Jan 2012 15:35:36 +0000
(19:35 +0400)
1
2
platform/platform-resources-en/src/messages/ProjectBundle.properties
patch
|
diff1
|
diff2
|
blob
|
history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/platform-resources-en/src/messages/ProjectBundle.properties
Simple merge
diff --cc
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
Simple merge
projects / idea / community.git / commitdiff