Diffusion GnuPG Password Manager e61ae88fee90

minor merge
e61ae88fee90
Actions

Tags

None

Subscribers

None

Description

minor merge

Details

Provenance

Anne Jan Brouwer <brouwer@annejan.com>

Authored on May 12 2015, 12:36 AM

Parents

rGPGPASS4188319250e0: Merge branch 'master' into develop
rGPGPASS8d4c7263fcd7: update paths

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

4188319250e0 Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
e5fda965b9e7 qt4 compile fix missing QQueue
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
1beb061015c1 Merge branch 'rdoeffinger-c++11' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
f6698c6df8ba Merge branch 'c++11' of https://github.com/rdoeffinger/qtpass into rdoeffinger…
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
d4cf59b98fc7 Merge branch 'master' into develop
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
3e5a4358a19b Merge pull request #47 from rdoeffinger/more_userinfo
Author
Anne Jan Brouwer <brouwer@annejan.com>
Browse Repository
No Audits
20d3ffdd0675 Provide more information in user list.
Author
Reimar Döffinger <brouwer@annejan.com>
Browse Repository
No Audits
208beb8e5eb3 Enable C++11 and use it to simplify loops.
Author
Reimar Döffinger <brouwer@annejan.com>
Browse Repository
No Audits

Changes (6)

Path

Size

usersdialog.cpp

rGPGPASSe61ae88fee90

mainwindow.cpp

Loading...

mainwindow.h

Loading...

qtpass.pro

Loading...

usersdialog.cpp

Loading...

usersdialog.h

Loading...

usersdialog.ui

Loading...