Garifullin_Farid/Pibd-13_Garifullin_F.M_Tank_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pibd-13_Garifullin_F.M_LabWork06 #15

Closed
Garifullin_Farid wants to merge 6 commits from LabWork_6 into LabWork_5
pull from: LabWork_6
merge into: Garifullin_Farid:LabWork_5
Conversation 1 Commits 6 Files Changed 15 +459 -27

6 Commits

Author SHA1 Message Date
Garifullin-Farid
53bc228956 fix 2024-05-19 22:42:18 +04:00
Garifullin-Farid
9373b38d7e fix 2024-05-19 22:26:09 +04:00
Garifullin-Farid
85b4605bbb fixLabWork_6 
# Conflicts:
#	ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs
#	ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
#	ProjectTank/ProjectTank/FormTankConfig.cs
 2024-05-19 22:26:06 +04:00
Garifullin-Farid
66ada06a40 labWork_5 готово 
# Conflicts:
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
#	ProjectTank/ProjectTank/FormTankConfig.cs
 2024-05-19 22:23:08 +04:00
Garifullin-Farid
3e86003a1a Лабораторная работа№4 
# Conflicts:
#	ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs
#	ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
 2024-05-19 22:19:35 +04:00
Garifullin-Farid
f677a3d244 1 2024-05-19 22:08:11 +04:00