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)
commit94a85281859d76aab047cde445fbcbde7335f799
tree59ddcb85d16cea7d53d2e34bad0589f9390e00f8
parenta32a32e1d3ed0da1f84ecdb52b5f9a5813dbffd6
parent92c433c0666dea9cd7995e2b971262a4946188a9
Merge branch 'master' into uta-python
python/edu/build/pycharm_edu_build.gant
python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml
python/src/META-INF/python-core-common.xml