Merge branch 'appcode10' into merge_appcode10
authorMaxim Shafirov <max@jetbrains.com>
Wed, 26 Oct 2011 15:53:14 +0000 (19:53 +0400)
committerMaxim Shafirov <max@jetbrains.com>
Wed, 26 Oct 2011 15:53:14 +0000 (19:53 +0400)
commitfc07b64645bb78ce31414b27555e639f959b541f
tree896549594ec1923f8bebd760306bd20e0ea806b3
parent6f307069afe1f4b06bde1eeee561ec8e082a8e78
parentb8bf207ac0f89040cc51240ee8626732abf44fb0
Merge branch 'appcode10' into merge_appcode10

Conflicts:
build.txt
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
platform/core-api/src/com/intellij/openapi/vfs/CharsetToolkit.java
platform/core-impl/src/com/intellij/openapi/editor/impl/CharArray.java
platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form
platform/platform-impl/src/com/intellij/internal/statistic/updater/StatisticsNotificationManager.java
platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
platform/platform-impl/src/com/intellij/notification/LogModel.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-impl/src/com/intellij/ui/EditorTextField.java
platform/platform-impl/src/com/intellij/util/ui/table/JBListTable.java
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources-en/src/misc/registry.properties
platform/util/src/com/intellij/openapi/ui/Splitter.java
platform/util/src/com/intellij/util/containers/MultiMap.java
platform/util/src/com/intellij/util/ui/MacUIUtil.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
plugins/git4idea/src/git4idea/actions/GitAdd.java
plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
plugins/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java
plugins/spellchecker/testSrc/com/intellij/spellchecker/inspector/SplitterTest.java
20 files changed:
platform/core-api/src/com/intellij/psi/impl/ElementBase.java
platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java
platform/lang-impl/src/com/intellij/codeInsight/highlighting/BraceHighlightingHandler.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java
platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
platform/platform-api/src/com/intellij/openapi/ui/TreeComboBox.java
platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/util/src/com/intellij/openapi/util/TextRange.java
platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java
platform/util/src/com/intellij/util/containers/MultiMap.java
platform/util/src/com/intellij/util/ui/UIUtil.java
plugins/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java