You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6bb9f6db7b
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" |
9 years ago | |
---|---|---|
.. | ||
CMakeLists.txt | ||
Messages.sh | ||
desktop.desktop | 9 years ago | |
desktopnameswidget.cpp | ||
desktopnameswidget.h | ||
main.cpp | 10 years ago | |
main.h | ||
main.ui |