kdevelop

Project ID: 352

0

A cross-platform IDE for C, C++, Python, QML/JavaScript and PHP

Forked from KDE / kdevelop

History Find file

SVN_SILENT made messages (.desktop file) - always resolve ours · 6e1a5174

Script Kiddy authored Jun 18, 2019

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"

6e1a5174

Name	Last commit	Last update
app		Loading commit data...
app_templates		Loading commit data...
appimage		Loading commit data...
cmake/modules		Loading commit data...
doc		Loading commit data...
file_templates		Loading commit data...
kdevplatform		Loading commit data...
pics		Loading commit data...
plugins		Loading commit data...
release-scripts		Loading commit data...
share		Loading commit data...
shortcuts		Loading commit data...
.arcconfig		Loading commit data...
.clang-format		Loading commit data...
.gitattributes		Loading commit data...
.gitignore		Loading commit data...
.gitlab-ci.yml		Loading commit data...
.kateconfig		Loading commit data...
.kateproject		Loading commit data...
.krazy		Loading commit data...
AUTHORS		Loading commit data...
CMakeLists.txt		Loading commit data...
COPYING		Loading commit data...
COPYING.DOC		Loading commit data...
COPYING.LIB		Loading commit data...
CTestConfig.cmake		Loading commit data...
CTestCustom.cmake		Loading commit data...
Doxyfile		Loading commit data...
ExtraDesktop.sh		Loading commit data...
INSTALL		Loading commit data...
KDevelopConfig.cmake.in		Loading commit data...
README.md		Loading commit data...
config-kdevelop.h.cmake		Loading commit data...
format.config.uncrustify		Loading commit data...
format_sources		Loading commit data...
kdevelop.kdev4		Loading commit data...
org.kde.kdevelop.appdata.xml		Loading commit data...