Merge branch 'BossV1'
# Conflicts: # CMakeLists.txt # headers/Plansza.h # sources/Plansza.cpp
This commit is contained in:
@@ -46,6 +46,8 @@ add_executable(LotoStatek main.cpp
|
||||
sources/PowerUp.cpp
|
||||
headers/Debuff.h
|
||||
sources/Debuff.cpp
|
||||
sources/Boss.cpp
|
||||
headers/Boss.h
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
|
||||
Reference in New Issue
Block a user