summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-10-27 22:16:59 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2020-10-27 22:16:59 +0100
commit2bac6d6c75f22416f61d0ef59951197df845e264 (patch)
treec56e25a940ec558920b55a20a1c350b0b8b49381
parentNo roomid on leave (diff)
downloadnheko-2bac6d6c75f22416f61d0ef59951197df845e264.tar.xz
Fix ambiguous namespace on gcc7
-rw-r--r--CMakeLists.txt2
-rw-r--r--io.github.NhekoReborn.Nheko.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index e5afb480..6b5bffd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -340,7 +340,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG ba5af13e5378915ff99a2db6ccfb0e9ab9eba70a + GIT_TAG ed6315563409ce9d47978ff2a2d771b863e375c5 ) FetchContent_MakeAvailable(MatrixClient) else() diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json
index 5738eb4f..5dddeceb 100644 --- a/io.github.NhekoReborn.Nheko.json +++ b/io.github.NhekoReborn.Nheko.json
@@ -146,7 +146,7 @@ "name": "mtxclient", "sources": [ { - "commit": "5af13e5378915ff99a2db6ccfb0e9ab9eba70a", + "commit": "ed6315563409ce9d47978ff2a2d771b863e375c5", "type": "git", "url": "https://github.com/Nheko-Reborn/mtxclient.git" }