-
Guillaume Roguez authored
Conflicts: daemon/src/sflthread.h daemon/src/video/video_preview.h daemon/src/video/video_scaler.h daemon/src/video/video_send_thread.cpp
f692c62d
Conflicts: daemon/src/sflthread.h daemon/src/video/video_preview.h daemon/src/video/video_scaler.h daemon/src/video/video_send_thread.cpp