Skip to content

Hw06#31

Open
chvl wants to merge 7 commits intoedugrfc:masterfrom
chvl:hw06
Open

Hw06#31
chvl wants to merge 7 commits intoedugrfc:masterfrom
chvl:hw06

Conversation

@chvl
Copy link
Contributor

@chvl chvl commented Jan 14, 2019

No description provided.

chvl added 7 commits December 17, 2018 22:04
# Conflicts:
#	.gitignore
#	VGViewer/src/ru/grfc/edu/vgviewer/VGViewer.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Coordinate.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Ellipse.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Figure.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Line.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Parallelogram.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Rectangle.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/Rhombus.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/RoundRectangle.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/support/FigureEnum.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/support/FigureParams.java
#	VGViewer/src/ru/grfc/edu/vgviewer/figures/support/NormalFigureFactory.java
#	edu_files/EduFiles/src/EduFiles9Tests.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant