Diffusion Umbrello 6478a41665da

Merge remote-tracking branch 'origin/Applications/18.04'
6478a41665da
Actions

Authored by habacker on Apr 18 2018, 10:19 PM.

Description

Merge remote-tracking branch 'origin/Applications/18.04'

  1. Conflicts:
  2. umbrello/codeimport/kdevcppparser/cpptree2uml.cpp

Details

Committed
habackerApr 18 2018, 10:19 PM
Parents
R139:94b3ca191736: Add context menu entry to add new stereotypes to stereotypes window
R139:87ce36b21fa2: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
87ce36b21fa2l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Apr 18 2018
d54c4979cbffhabacker
Fix "c++ importer does not recognize 'explicit' keyword" 
Apr 17 2018

Changes (4)

PathPackages
Mlib/cppparser/parser.cpp
Mlib/kdev5-php/kdevphpsupport.json
Atest/import/cxx/explicit-constructor.h
Mumbrello/codeimport/kdevcppparser/cpptree2uml.cpp

R139:6478a41665da

View Options

lib/cppparser/parser.cpp

Loading...
View Options

lib/kdev5-php/kdevphpsupport.json

Loading...
View Options

test/import/cxx/explicit-constructor.h

Loading...
View Options

umbrello/codeimport/kdevcppparser/cpptree2uml.cpp

Loading...