aboutsummaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2017-05-30 18:54:41 -0400
committerRob Austein <sra@hactrn.net>2017-05-30 18:54:41 -0400
commitf3a7d2993b46e981208ac68996db609a31d80163 (patch)
treee32e9fbbfcc1017d8755fc8aeab67dc288cd5e0e /GNUmakefile
parentade02ebabf88481bc763ea6a9b2f97e87f0a6210 (diff)
parent358b3803cdedad607cf649221d0b7e3ce66b45f2 (diff)
Merge branch 'logout' into ks9
The internal keystore API has changed enough since where the "logout" branch forked that a plain merge would have no prayer of compiling, must less running. So this merge goes well beyond manual conflict resolution: it salvages the useful code from the "logout" branch, with additional code as needed to reimplement the functionality. Sorry.
Diffstat (limited to 'GNUmakefile')
0 files changed, 0 insertions, 0 deletions