Nikolay Krasko a0e45e9a12 Merge master into idea14 ...

Conflicts:
	.idea/runConfigurations/All_Tests.xml
	idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
	idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
	idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt

2014-06-25 16:26:01 +04:00

..

artifacts

Extracted interface and moved implementation of IncrementalCache to jps-plugin, accessing cache via Java service loader.

2014-06-18 22:56:43 +04:00

copyright

Prevented copyrights from appearing in testData.

2012-11-28 15:27:57 +04:00

dictionaries

Replaced passing MemberFilter to constructor with method overriding.

2014-06-19 01:03:58 +04:00

inspectionProfiles

Minor, catch all exceptions in asm verification in tests

2014-04-11 21:57:45 +04:00

libraries

Add structure view source roots

2014-05-30 00:04:03 +04:00

runConfigurations

Merge master into idea14

2014-06-25 16:26:01 +04:00

scopes

Scope for IDE classes

2013-09-13 22:39:47 +02:00

.name

Rename project to Kotln

2012-03-26 10:52:11 +04:00

ant.xml

Automatically enable Kotlin plugin if it was disabled

2014-04-04 02:10:30 +04:00

codeStyleSettings.xml

Minor: added TypeScript to codeStyleSettings.xml

2014-03-11 20:04:04 +04:00

compiler.xml

Change wildcard resource pattern

2012-11-27 14:49:11 +04:00

encodings.xml

IDEA plugin, initial

2010-12-10 16:12:31 +03:00

fileColors.xml

Scope for IDE classes

2013-09-13 22:39:47 +02:00

kotlinc.xml

Annotations used instead of List<AnnotationDescriptor>

2014-01-20 16:17:54 +04:00

misc.xml

Added panels for JVM and JS settings to the Kotlin Compiler Settings tab.

2013-10-24 18:37:00 +04:00

modules.xml

Introduce module 'reflection', move KFunctionN to it

2014-05-19 19:50:57 +04:00

projectCodeStyle.xml

LOOP_RANGE_NEXT

2011-09-02 12:33:53 +04:00

uiDesigner.xml

Add to UI Designer palette some intellij.ui components.

2013-10-24 19:06:04 +04:00

vcs.xml

Added navigation to YouTrack issues from commit messages.

2012-05-16 17:12:06 +04:00