Maxim Shafirov fc07b64645 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

2011-10-26 19:53:14 +04:00

..

breakgen

…

fileWatcher

buffer overflow handling in fsnotifier (IDEA-67787)

2011-08-04 19:12:57 +02:00

focusKiller

…

fsNotifier

compile to be compatible with 32bit

2011-10-05 16:18:25 +04:00

IdeaWin32

fix line breaks

2011-10-12 18:18:12 +02:00

macrestarter

…

restarter

ignore compilation output

2011-02-21 21:08:53 +01:00

runner/runnerw

…

VistaUpdaterLauncher

JetBrains products updater: invoke UAC elevation if needed (IDEA-52571)

2011-09-01 11:41:25 +04:00