Merge branch 'master' into amakeev/build-number

This commit is contained in:
Anton Makeev
2016-04-07 10:58:23 +02:00
735 changed files with 9439 additions and 9887 deletions
@@ -8,7 +8,6 @@
<icon size32="/PyCharmEdu32.png" size16="/PyCharmEdu16.png" ico="PyCharmEdu.ico"/>
<package code="__PACKAGE_CODE__"/>
<names product="PyCharm" fullname="PyCharm Edu" script="charm"/>
<install-over minbuild="0" maxbuild="0" version="2.x"/>
<welcome-screen logo-url="/PyCharmEduWelcomeScreen.png"/>