Спр
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
Справка
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/Domain/Classes/ConstantRepository.dcu
	UGTU/Domain/Controllers/CommonNagruzkaController.dcu
	UGTU/Domain/Controllers/FactNagruzkaController.dcu
	UGTU/Domain/Controllers/GeneralController.dcu
	UGTU/Domain/Controllers/NagruzkaDirectory.dcu
	UGTU/Domain/Controllers/PlanNagruzkaController.dcu
	UGTU/Domain/Controllers/PreparationNagruzkaController.dcu
	UGTU/Domain/Controllers/SheduleAccountController.dcu
	UGTU/Domain/Controllers/SheduleClasses.dcu
	UGTU/Domain/Controllers/SheduleConstraintController.dcu
	UGTU/Domain/Controllers/SheduleController.dcu
	UGTU/Domain/Controllers/SheduleGrids.dcu
	UGTU/Domain/Controllers/SheduleMainController.dcu
	UGTU/Domain/Interfaces/CommonIntf.dcu
	UGTU/Domain/Interfaces/DefImpl/CommonIntfImpl.dcu
	UGTU/Domain/Reports/N_DepsSemester.dcu
	UGTU/Domain/Reports/N_FactDeps.dcu
	UGTU/Domain/Reports/N_FactPrepodsExecute.dcu
	UGTU/Domain/Reports/N_FullDepsSemester.dcu
	UGTU/Domain/Reports/N_PFODeps.dcu
	UGTU/Domain/Reports/N_PlanDepsCompare.dcu
	UGTU/Domain/Reports/N_PlanDepsSemesters.dcu
	UGTU/Domain/Reports/N_YearsCommonComparison.dcu
	UGTU/Domain/Reports/N_YearsComparison.dcu
	UGTU/Domain/Reports/N_YearsStaffComparison.dcu
	UGTU/Utils/ExceptionBase.dcu
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
Ветка
Merge pull request #5 from UGTU/Release-1.0.4.441

Merge branch 'PrepodImport' into Release-1.0.4.441
Merge pull request #6 from UGTU/PrepodImport

Merge pull request #5 from UGTU/Release-1.0.4.441
COMMIT
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441

Conflicts:
	UGTU/Domain/Classes/ConstantRepository.dcu
	UGTU/Domain/Controllers/CommonNagruzkaController.dcu
	UGTU/Domain/Controllers/FactNagruzkaController.dcu
	UGTU/Domain/Controllers/GeneralController.dcu
	UGTU/Domain/Controllers/NagruzkaDirectory.dcu
	UGTU/Domain/Controllers/PlanNagruzkaController.dcu
	UGTU/Domain/Controllers/PreparationNagruzkaController.dcu
	UGTU/Domain/Controllers/SheduleAccountController.dcu
	UGTU/Domain/Controllers/SheduleClasses.dcu
	UGTU/Domain/Controllers/SheduleConstraintController.dcu
	UGTU/Domain/Controllers/SheduleController.dcu
	UGTU/Domain/Controllers/SheduleGrids.dcu
	UGTU/Domain/Controllers/SheduleMainController.dcu
	UGTU/Domain/Interfaces/CommonIntf.dcu
	UGTU/Domain/Interfaces/DefImpl/CommonIntfImpl.dcu
	UGTU/Domain/Reports/N_DepsSemester.dcu
	UGTU/Domain/Reports/N_FactDeps.dcu
	UGTU/Domain/Reports/N_FactPrepodsExecute.dcu
	UGTU/Domain/Reports/N_FullDepsSemester.dcu
	UGTU/Domain/Reports/N_PFODeps.dcu
	UGTU/Domain/Reports/N_PlanDepsCompare.dcu
	UGTU/Domain/Reports/N_PlanDepsSemesters.dcu
	UGTU/Domain/Reports/N_YearsCommonComparison.dcu
	UGTU/Domain/Reports/N_YearsComparison.dcu
	UGTU/Domain/Reports/N_YearsStaffComparison.dcu
	UGTU/Utils/ExceptionBase.dcu
	UGTU/ugtu.exe
	UGTU/ugtu.identcache
Merge branch 'Release-1.0.4.441' into VedomBranch

Conflicts:
	UGTU/Domain/Controllers/uUspevGroupController.pas
	UGTU/Presentation/Frames/uGroup.dfm
	UGTU/Presentation/Frames/uGroup.pas
	UGTU/reports/Vedomost_with_BRS.xlt
	UGTU/ugtu.dproj.local
Конфликты
классы
commit
commit 505
Добавлены ведомости
Merge branch 'Release-1.0.4.441' of https://github.com/UGTU/Old-School into Release-1.0.4.441
Merge branch 'Release-1.0.4.441' into VedomBranch

Conflicts:
	UGTU/ugtu.dproj.local
precommit
precommit