umbrello

Launchpad does not know where umbrello hosts its code.

Bazaar branches

Name Status Last Modified Last Commit
lp:~neon/umbrello/master 1 Development 2016-01-02 03:24:59 UTC
4868. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2016-01-02 03:24:59 UTC

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

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"
lp:~kubuntu-members/umbrello/4.11 1 Development 2014-01-22 18:15:11 UTC
3948. Support hex digits in numeric literal...

Author: Ralf Habacker
Revision Date: 2014-01-22 18:15:11 UTC

Support hex digits in numeric literals.

BUG:330296
FIXED-IN:4.11.6
(cherry picked from commit a10b8924ae6935df7b6c8dc5907ff3a6a45bef7e)

Conflicts:
 umbrello/codeimport/kdevcppparser/lexer.cpp
 umbrello/codeimport/kdevcppparser/preprocesslexer.cpp
 umbrello/codeimport/kdevcppparser/preprocesslexer.h
1 → 2 of 2 results First • Previous • Next • Last