henry/whisper-com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'simulationCom' of ssh://dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/whisper-com into simulationCom

Browse Source
This commit is contained in:
Henry Winkel
2022-12-21 14:12:58 +01:00
parent f767fd425f 1ae59dbf28
commit 08acefd140
8 changed files with 846 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -61,6 +61,11 @@ add_library(whisper-com STATIC
src/WHISPER/Messages/Leave.cpp
<<<<<<< HEAD
=======
# include/WHISPER/Messages/Track.hpp
# src/WHISPER/Messages/Track.cpp
>>>>>>> 1ae59dbf28dcff8e15f88de743522c6021f0e26f
@@ -70,6 +75,10 @@ add_library(whisper-com STATIC
include/WHISPER/Messages/Protos/join.pb.cc
include/WHISPER/Messages/Protos/leave.pb.cc
<<<<<<< HEAD
=======
# include/WHISPER/Messages/Protos/raw_track.pb.cc
>>>>>>> 1ae59dbf28dcff8e15f88de743522c6021f0e26f
)