mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-15 11:32:11 +01:00
f838f02db1
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" |
||
---|---|---|
.. | ||
3rdparty | ||
data | ||
CMakeLists.txt | ||
Messages.sh | ||
metadata.desktop | ||
mousegestures.cpp | ||
mousegestures.h | ||
mousegestures.qrc | ||
mousegesturesplugin.cpp | ||
mousegesturesplugin.h | ||
mousegesturessettingsdialog.cpp | ||
mousegesturessettingsdialog.h | ||
mousegesturessettingsdialog.ui |