Diffusion Kleopatra d4abbdbb1aac

Merge branch 'gpg4win'
d4abbdbb1aacUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'gpg4win'

Details

Provenance

• aheinecke

Authored on May 8 2013, 6:18 PM

Parents

rKLEOPATRA878a5305d339: Fix connections now that the dialog is a widget
rKLEOPATRA7ecea7ad20d5: Merge remote-tracking branch 'origin/KDE/4.10'

Branches

Unknown

Tags

Unknown

Event Timeline

• aheinecke committed rKLEOPATRAd4abbdbb1aac: Merge branch 'gpg4win' (authored by • aheinecke).May 8 2013, 6:18 PM

Merged Changes

878a5305d339 Fix connections now that the dialog is a widget
Author
• aheinecke
Browse Repository
No Audits
2583e7bb352c Fix typo in screader debug code
Author
• aheinecke
Browse Repository
No Audits
db20ce145d06 Allow external process window activation
Author
• aheinecke
Browse Repository
No Audits
4db3732831b7 Add DEBUG_SCREADER macro to silence some output
Author
• aheinecke
Browse Repository
No Audits
e103d4d8bd45 Make default OpenPGP file extension configurable
Author
• aheinecke
Browse Repository
No Audits

Changes (11)

Path

Size

CMakeLists.txt

conf/

CMakeLists.txt

cryptooperationsconfigwidget.cpp

cryptooperationsconfigwidget.ui

dialogs/

certificatedetailsdialog.cpp

certificatedetailsdialog.ui

kcfg/

fileoperationspreferences.kcfg

	fileoperationspreferences.kcfgc
	tooltippreferences.kcfgc

kleopatraapplication.cpp

smartcard/

readerstatus.cpp

utils/

classify.cpp

rKLEOPATRAd4abbdbb1aac

View Options

CMakeLists.txt

View Options

conf/CMakeLists.txt

View Options

conf/cryptooperationsconfigwidget.cpp

View Options

conf/cryptooperationsconfigwidget.ui

View Options

dialogs/certificatedetailsdialog.cpp

View Options

dialogs/certificatedetailsdialog.ui

View Options

kcfg/fileoperationspreferences.kcfg

View Options

kcfg/fileoperationspreferences.kcfgc

View Options

kleopatraapplication.cpp

View Options

smartcard/readerstatus.cpp

View Options

Merge branch 'gpg4win'd4abbdbb1aacUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (11)

rKLEOPATRAd4abbdbb1aac

CMakeLists.txt

conf/CMakeLists.txt

conf/cryptooperationsconfigwidget.cpp

conf/cryptooperationsconfigwidget.ui

dialogs/certificatedetailsdialog.cpp

dialogs/certificatedetailsdialog.ui

kcfg/fileoperationspreferences.kcfg

kcfg/fileoperationspreferences.kcfgc

kleopatraapplication.cpp

smartcard/readerstatus.cpp

utils/classify.cpp

Merge branch 'gpg4win'
d4abbdbb1aacUnpublished
Actions