commit | 722a353bc893172c38a5d3797902e4aaf557304c | [log] [tgz] |
---|---|---|
author | Tor Norbye <[email protected]> | Wed Aug 07 14:56:41 2013 -0700 |
committer | Tor Norbye <[email protected]> | Wed Aug 07 14:56:41 2013 -0700 |
tree | 66cc5535c794ffb973e9834bc5f87e4d0ac3680f | |
parent | ba434a62c956150932825cddd0c2a70ad54cc704 [diff] | |
parent | 6739a8f0977b70ddc8a8283b169902da3f2eecb3 [diff] |
Merge remote-tracking branch 'aosp/snapshot-master' into merge Conflicts: platform/external-system-api/resources/i18n/ExternalSystemBundle.properties platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemIdeNotificationManager.java platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/notification/ExternalSystemNotificationExtension.java platform/platform-resources/src/idea/ExternalSystemActions.xml plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleConfigLocator.java plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleSystemSettingsControl.java plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleConstants.java Change-Id: Idbfc792f4edb1ccc79c68b5f9c7d5c02d1a9f926
This is the official GitHub mirror of the IntelliJ IDEA Community Edition source code.
To develop IntelliJ IDEA, you can use either IntelliJ IDEA Community Edition or IntelliJ IDEA Ultimate. To build and run the code:
Pull requests are welcome. Please make sure that you follow the IntelliJ Coding Guidelines. Note that you'll need to submit a Contributor Agreement before we can accept your pull request.
See http://www.jetbrains.org/ for more information.
You can find information on the internal architecture of IntelliJ IDEA and plugin development at the PluginDevelopment site.