Commit Graph

12 Commits

Author SHA1 Message Date
Luke Howard
e128b0ca01 Merge branch 'master' into lukeh/moonshot
Conflicts:
	lib/gssapi/krb5/external.c
	lib/libedit/src/vi.c
2011-05-12 13:04:55 +02:00
Love Hornquist Astrand
e062131344 undef __weak_reference on freebsd since its different 2011-04-25 13:33:01 -07:00
Love Hornquist Astrand
bd98e01ff9 ignore generated files better (and remove them from repo) 2011-04-01 00:36:27 -07:00
Luke Howard
cb92ea2d54 another variant on hack for libedit build on FreeBSD 2011-03-22 00:24:51 +11:00
Luke Howard
5d773c3d7f revert libedit FreeBSD hack, will endeavour to fix properly 2011-03-22 00:05:37 +11:00
Luke Howard
c99906eed4 update for autoheader 2011-03-22 00:02:00 +11:00
Luke Howard
871af1976f remove autogenerated gunk 2011-03-21 23:59:01 +11:00
Luke Howard
9053e86254 Merge branch 'lukeh/moonshot' of github.com:heimdal/heimdal into lukeh/moonshot
Conflicts:
	lib/gssapi/version-script.map
2011-03-21 23:55:54 +11:00
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
6819c18378 really remove extra files 2011-03-13 17:12:01 -07:00
Love Hornquist Astrand
1c782af347 don't don't build files not used 2011-03-13 17:10:20 -07:00
Love Hornquist Astrand
9ef071c94e replace libeditline with libedit 2011-03-13 14:18:14 -07:00