Andrew Golovashevich f285b093cc Merge branch 'refs/heads/lab2/master' into lab1/qt ... # Conflicts: # CMakeLists.txt # src/painter.cpp # src/shaders.cpp		2024-11-13 13:35:52 +03:00
src	Merge branch 'refs/heads/lab2/master' into lab1/qt	2024-11-13 13:35:52 +03:00
.gitignore	Initial commit	2024-10-09 13:30:32 +03:00
CMakeLists.txt	Qt widgets	2024-11-13 00:15:20 +03:00