Merge branch 'master' into codeStyleExtractor

author jamesbrain <marso.des@gmail.com>

Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)

committer jamesbrain <marso.des@gmail.com>

Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
author jamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
committer jamesbrain <marso.des@gmail.com>
Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
diff --cc platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
Simple merge
diff --cc platform/platform-resources/src/META-INF/LangExtensionPoints.xml
Simple merge
diff --cc platform/platform-resources/src/idea/LangActions.xml
Simple merge
diff --cc resources/src/META-INF/IdeaPlugin.xml
Simple merge
author	jamesbrain <marso.des@gmail.com>
	Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
committer	jamesbrain <marso.des@gmail.com>
	Thu, 1 Oct 2015 10:48:14 +0000 (13:48 +0300)
		1	2
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml	patch \|	diff1 \|	diff2 \|	blob \| history
platform/platform-resources/src/idea/LangActions.xml	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/META-INF/IdeaPlugin.xml	patch \|	diff1 \|	diff2 \|	blob \| history