last
Merge branch 'master'
буквы
иконка
Merge branch 'origin/master'

Conflicts:
	Calculator/Calculator/icon.png
last
Merge branch 'master'

Conflicts:
	Calculator/Calculator/PlotRectViewController.m
last
Merge branch 'master'

Conflicts:
	Calculator/Calculator/PlotRectViewController.m
	Calculator/Calculator/en.lproj/MainStoryboard.storyboard
масштабирование чертежа
last
Merge branch 'master'

Conflicts:
	Calculator/Calculator.xcodeproj/project.pbxproj
	Calculator/Calculator/PlotRectViewController.m
	Calculator/Calculator/en.lproj/MainStoryboard.storyboard
построение чертежа
Merge branch 'perimetr2'