diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
|---|---|---|
| committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
| commit | f9f366e296a68be0aa2eb7bfd0552da31896a18c (patch) | |
| tree | f52760d5505b84074a9c1b50b4fe16e40035ba06 /src/RTC.cpp | |
| parent | b746c0b7279d1f5b4bcfd02c115b09d583e9df4f (diff) | |
| parent | d6332f96f162849ad0dde2738cacd3fae6e76e5d (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform
# Conflicts:
# src/frontend/qt_sdl/CMakeLists.txt
# src/frontend/qt_sdl/Platform.cpp
# src/frontend/qt_sdl/main.cpp
Diffstat (limited to 'src/RTC.cpp')
0 files changed, 0 insertions, 0 deletions