Fri, 02 Sep 2016 20:53:49 +0200Merge with default outlook_mime_support
Markus Schaber <markus@pep-security.net> [Fri, 02 Sep 2016 20:53:49 +0200] rev 1130
Merge with default

Fri, 02 Sep 2016 16:54:55 +0200adding safeguards keysync
Volker Birk <vb@pep.foundation> [Fri, 02 Sep 2016 16:54:55 +0200] rev 1129
adding safeguards

Fri, 02 Sep 2016 16:40:06 +0200adding encode_sync_msg() keysync
Volker Birk <vb@pep.foundation> [Fri, 02 Sep 2016 16:40:06 +0200] rev 1128
adding encode_sync_msg()

Fri, 02 Sep 2016 14:41:12 +0200Added openpgp_compat.* to build
krista [Fri, 02 Sep 2016 14:41:12 +0200] rev 1127
Added openpgp_compat.* to build

Fri, 02 Sep 2016 13:30:36 +0200merged with default. krista_local_windows
krista [Fri, 02 Sep 2016 13:30:36 +0200] rev 1126
merged with default.

Wed, 31 Aug 2016 17:26:59 +0200merged with default krista_local_windows
krista [Wed, 31 Aug 2016 17:26:59 +0200] rev 1125
merged with default

Tue, 02 Aug 2016 12:55:50 +0200merged w default krista_local_windows
krista [Tue, 02 Aug 2016 12:55:50 +0200] rev 1124
merged w default

Tue, 26 Jul 2016 11:48:22 +0200Merge with default krista_local_windows
krista [Tue, 26 Jul 2016 11:48:22 +0200] rev 1123
Merge with default

Tue, 26 Jul 2016 11:47:15 +0200local changes - NOT TO BE PUSHED krista_local_windows
krista [Tue, 26 Jul 2016 11:47:15 +0200] rev 1122
local changes - NOT TO BE PUSHED

Fri, 02 Sep 2016 09:47:35 +0200Xcode: +asn1_helper.c keysync
Dirk Zimmermann <dirk@pep-project.org> [Fri, 02 Sep 2016 09:47:35 +0200] rev 1121
Xcode: +asn1_helper.c