christos b33532b64a Merge conflicts.		2014-06-05 14:39:46 +00:00
..
heimdal	kill extra )	2014-05-12 18:46:27 +00:00
libsaslc	Do not install files in usr/share/ when MKSHARE=no	2014-01-02 17:57:58 +00:00
netpgp	Merge riastradh-drm2 to HEAD.	2014-03-18 18:20:35 +00:00
openssh	Don't print an empty line after the debug message "Enabled Dynamic	2014-02-20 08:20:05 +00:00
openssl	Merge conflicts.	2014-06-05 14:39:46 +00:00
Makefile	mv the MKCRYPTO protection higher; ideally should be at the top for this	2013-02-12 20:31:13 +00:00