Commit Graph

2 Commits

Author SHA1 Message Date
Luke Howard
9455577b65 Merge branch 'master' of github.com:heimdal/heimdal
Conflicts:
	lib/gssapi/gssapi/gssapi.h
	lib/gssapi/gssapi_mech.h
	lib/gssapi/mech/gss_mech_switch.c
2011-03-20 19:08:10 +11:00
Love Hornquist Astrand
9ef071c94e replace libeditline with libedit 2011-03-13 14:18:14 -07:00