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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
krdc_rdp.json | ||
rdphostpreferences.cpp | ||
rdphostpreferences.h | ||
rdppreferences.cpp | ||
rdppreferences.h | ||
rdppreferences.ui | ||
rdpsession.cpp | ||
rdpsession.h | ||
rdpview.cpp | ||
rdpview.h | ||
rdpviewfactory.cpp | ||
rdpviewfactory.h |