jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 16:02:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts.

Browse source 
Took 10 minutes

Took 50 seconds

Took 51 seconds

Took 2 minutes

Took 1 minute
This commit is contained in:
Lukas Brübach 2025-10-08 10:01:24 +02:00
commit c5072a013b
30 changed files with 3862 additions and 3148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_server/CMakeLists.txt
View file

@ -4,6 +4,7 @@ set(CMAKE_AUTORCC ON)
set(HEADERS
libcockatrice/server/game/server_abstract_participant.h
libcockatrice/server/game/server_abstract_player.h
libcockatrice/server/game/server_arrow.h
libcockatrice/server/game/server_arrowtarget.h
libcockatrice/server/game/server_card.h
@ -35,6 +36,7 @@ add_library(
${MOC_SOURCES}
libcockatrice/server/debug_pb_message.cpp
libcockatrice/server/game/server_abstract_participant.cpp
libcockatrice/server/game/server_abstract_player.cpp
libcockatrice/server/game/server_arrow.cpp
libcockatrice/server/game/server_arrowtarget.cpp
libcockatrice/server/game/server_card.cpp