Diffusion Kexi 7d48be82d25b

Merge remote-tracking branch 'origin/3.2'
7d48be82d25b
Actions

Authored by staniek on Apr 23 2019, 8:37 PM.

Description

Merge remote-tracking branch 'origin/3.2'

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

Details

Committed
staniekApr 23 2019, 8:37 PM
Parents
R71:cc60a25d1e7f: SVN_SILENT made messages (.desktop file) - always resolve ours
R71:f04df92849de: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
cc60a25d1e7fl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Apr 20 2019
53acfa525644l10n daemon script
GIT_SILENT made messages (after extraction) 
Apr 12 2019
e2eb6f465294l10n daemon script
GIT_SILENT made messages (after extraction) 
Mar 25 2019
716789fedf9bstaniek
Version 3.2.0 final 
Mar 12 2019

Empty Commit

This commit is empty and does not affect any paths.