commit | bbb37025b1c9055f3ad880ac570bb7625379740b | [log] [tgz] |
---|---|---|
author | Tor Norbye <[email protected]> | Fri May 31 08:10:59 2013 -0700 |
committer | Tor Norbye <[email protected]> | Fri May 31 08:54:51 2013 -0700 |
tree | 918ccd6d27e0d5e5963aa8e657456ff1a45953c6 | |
parent | 9b82a5a86313516e55b7a35dd559cd685f2b11ff [diff] | |
parent | ec3fb1e06285c0467a7a20360ca80453bc7635d4 [diff] |
Merge remote-tracking branch 'aosp/snapshot-master' into merge Conflicts: .idea/modules.xml platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java platform/platform-impl/src/com/intellij/internal/statistic/StatisticsUploadAssistant.java resources-en/src/tips/Welcome.html Change-Id: I2798b45d4cc245f31b14a99b68df08075faf2f5c
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.