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:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user