Merge branch 'master' into uta-python
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 21 Dec 2015 16:46:35 +0000 (19:46 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 21 Dec 2015 16:46:35 +0000 (19:46 +0300)
1  2 
python/edu/build/pycharm_edu_build.gant
python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml
python/src/META-INF/python-core-common.xml