diff options
| author | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 19:44:37 +0200 |
|---|---|---|
| committer | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 19:44:37 +0200 |
| commit | b306929311f04dced4e5c0d9c55509df0553bfb1 (patch) | |
| tree | 1f1f7408a0796cb886ae99be9eff5e8b5f1b156c /CMakeLists.txt | |
| parent | fefaad53943d8b542bd8f288dae7d15e08c67b32 (diff) | |
Resolved merge conflicts.
This comment format is just tiring for the eyes. Imagine being on 1080p and not being able to read more than 5 method definitions due to comments.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f3684f1c..d482a5c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,8 @@ add_executable(Attorney_Online src/path_functions.cpp src/scrolltext.cpp src/scrolltext.h + src/serverdata.cpp + src/serverdata.h src/text_file_functions.cpp src/widgets/aooptionsdialog.cpp src/widgets/aooptionsdialog.h |