Merge branch 'master' into amakeev/build-number
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 7 Apr 2016 08:58:23 +0000 (10:58 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 7 Apr 2016 08:58:23 +0000 (10:58 +0200)
commit8ef1d93cc49438d98a8c0b6d82ed70948abe00a2
treeb434e654f8a8865a59a6af94256c4d69d20339fc
parentcc5e4a35eeb044e87c56b3111ee99c5c60e47c0f
parent08fda42e761b17201f969a362c9a45f511d8cb3c
Merge branch 'master' into amakeev/build-number
community-resources/src/idea/IdeaApplicationInfo.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java
platform/util/src/com/intellij/openapi/util/BuildNumber.java
platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java
python/educational-python/resources/idea/PyCharmEduApplicationInfo.xml
python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml