mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
1c2c8ab982
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" |
||
---|---|---|
.. | ||
AutoScroll | ||
FlashCookieManager | ||
GreaseMonkey | ||
KDEFrameworksIntegration | ||
MouseGestures | ||
PIM | ||
PyFalkon | ||
StatusBarIcons | ||
TabManager | ||
TestPlugin | ||
VerticalTabs | ||
CMakeLists.txt |