liana.bakradze 94d2975a40 Merge remote-tracking branch 'origin/liana/course-creator-improvements' ...

# Conflicts:
#	python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java
#	python/educational-core/student/resources/META-INF/plugin.xml
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyPluginConfigurator.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java

2016-04-23 09:49:06 +03:00

..

build

EDU: updated path to win jdk.

2016-04-07 19:56:26 +03:00

course-creator-python

replace run tests action with run configuration

2016-04-20 17:51:31 +03:00

gen/icons

…

resources

Merge branch 'master' into amakeev/build-number

2016-04-07 10:58:23 +02:00

src

EDU-475 Step over in debugger doesn't work for unresolved reference

2016-04-15 15:44:20 +03:00

student-python

Merge remote-tracking branch 'origin/liana/course-creator-improvements'

2016-04-23 09:49:06 +03:00

educational-python.iml

Remove twitter4j from project libraries

2016-03-16 21:11:17 +03:00

main_pycharm_edu.iml

…