Permalink
Browse files

Merge remote-tracking branch 'origin/master' into scrum/IntegrateRefa…

…ctorings

Conflicts:
	.idea/compiler.xml
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/actions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/constraints/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/editor/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/closures/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/conceptFunctionDefaults/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/main/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generator/java/strings/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/intentions/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/plugin/generated
	languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/textGen/generated
	languages/baseLanguage/baseLanguage/source_gen/jetbrains/mps/baseLanguage/textGen/trace.info
	languages/languageDesign/refactoring/source_gen.caches/jetbrains/mps/lang/refactoring/generator/baseLanguage/template/main/generated
	languages/languageDesign/structure/solutions/pluginSolution/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated
	languages/languageDesign/test/solutions/jetbrains.mps.lang.test.runtime/source_gen.caches/jetbrains/mps/lang/test/runtime/generated
	plugins/build-deprecated/languages/solutions/jetbrains.mps.buildlanguage.execution/models/jetbrains/mps/build/deprecated/execution.mps
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/behavior/generated
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/generated
	plugins/mpsbuild/languages/build/source_gen.caches/jetbrains/mps/build/util/generated
	plugins/mpsbuild/languages/build/utilModels/jetbrains/mps/buildScript/util.mps
	plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/models/jetbrains/mps/build/mps/runtime/anttask.mps
	plugins/mpsbuild/languages/solutions/jetbrains.mps.build.mps.runtime/source_gen.caches/jetbrains/mps/build/mps/runtime/anttask/generated
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/actions/generated
	plugins/mpsjava/platform/source_gen/jetbrains/mps/ide/java/actions/trace.info
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/datatransfer/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/generated
	workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/modeltree/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/actions/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/common/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dataFlow/presentation/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/depanalyzer/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dependencyViewer/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/dialogs/project/creation/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/embeddableEditor/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/findusages/view/optionseditor/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/icons/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/hierarchy/toggle/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/newSolutionDialog/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/properties/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/refactoring/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/script/plugin/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/typesystem/trace/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/ide/vcs/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/watching/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/actions/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/boundpanels/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/descriptors/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/diffrowtable/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/editors/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/lists/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/renderers/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/components/parts/validators/generated
	workbench/mps-workbench/source_gen.caches/jetbrains/mps/workbench/dialogs/project/properties/project/generated
	workbench/mps-workbench/source_gen/jetbrains/mps/ide/actions/trace.info
  • Loading branch information...
alperovich committed May 30, 2012
2 parents 114975f + 13aeca3 commit 5fc9e1a11fb46951fea255e29f40c58f142e6d7b

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.

0 comments on commit 5fc9e1a

Please sign in to comment.