Diffusion Kexi 3730bf3fe0db

Merge remote-tracking branch 'origin/3.1'
3730bf3fe0db
Actions

Authored by staniek on Oct 9 2018, 9:33 PM.

Description

Merge remote-tracking branch 'origin/3.1'

  1. Conflicts:
  2. src/data/org.kde.kexi.appdata.xml.cmake

Details

Committed
staniekOct 9 2018, 9:33 PM
Parents
R71:540282291bec: SVN_SILENT made messages (.desktop file) - always resolve ours
R71:99a71f1e46f0: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
540282291becl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Sep 22 2018
5a85a149af4el10n daemon script
GIT_SILENT made messages (after extraction) 
Sep 22 2018

Empty Commit

This commit is empty and does not affect any paths.