4.9'
1cdd299c67a4Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'origin/KDE/4.9'

Conflicts:
CMakeLists.txt

Details

Provenance

Authored on Sep 27 2012, 9:17 PM

Parents

Branches

Unknown

Tags

Unknown

Merged Changes

Changes (5)

Path

Size

conf/

rKLEOPATRA1cdd299c67a4

conf/kleopatra_config_appear.desktop

conf/kleopatra_config_cryptooperations.desktop

conf/kleopatra_config_dirserv.desktop

conf/kleopatra_config_gnupgsystem.desktop

conf/kleopatra_config_smimevalidation.desktop

Merge remote-tracking branch 'origin/KDE/4.9'1cdd299c67a4UnpublishedActions