Merge branch 'liana/edu'
authorliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 14 Mar 2016 11:59:30 +0000 (14:59 +0300)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 14 Mar 2016 11:59:30 +0000 (14:59 +0300)
commit64a2edbc55ae13b3db083353200ea13c880ee016
tree8c45eeaf60f9f45bd1964e791b3f1bf908d275d3
parentb376b6a53b76f0b725d02386b3aa244f898ef911
parentf232d37361caf7b01e50554e4b8dda09acbda147
Merge branch 'liana/edu'

# Conflicts:
# python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
# python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
15 files changed:
python/educational-core/student/resources/META-INF/plugin.xml
python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
python/educational-python/student-python/resources/META-INF/plugin.xml
python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java