mirror of
https://invent.kde.org/network/krdc
synced 2024-07-05 17:29:34 +00:00
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
qtonly | ||
CMakeLists.txt | ||
krdc_vnc.json | ||
vncclientthread.cpp | ||
vncclientthread.h | ||
vnchostpreferences.cpp | ||
vnchostpreferences.h | ||
vncpreferences.cpp | ||
vncpreferences.h | ||
vncpreferences.ui | ||
vncsshtunnelthread.cpp | ||
vncsshtunnelthread.h | ||
vncview.cpp | ||
vncview.h | ||
vncviewfactory.cpp | ||
vncviewfactory.h |