Merge remote-tracking branch 'origin/serduszka'

# Conflicts:
#	CMakeLists.txt
#	headers/Actor.h
#	headers/Plansza.h
#	headers/Player.h
#	sources/Plansza.cpp
#	sources/Player.cpp
This commit is contained in:
2024-12-13 19:48:39 +01:00
10 changed files with 242 additions and 10 deletions

View File

@@ -40,6 +40,8 @@ add_executable(LotoStatek main.cpp
sources/Wiazkowiec.cpp
headers/Beam.h
sources/Beam.cpp
headers/Heart.hpp
sources/Heart.cpp
)
if(WIN32)