release.nix · 9c9da07f4c28192a05b3a88c7d5d1817ea392d79 · ogs / inf / Guix

12 years ago

Merge branch 'master' into core-updates · 4050e5d6

Ludovic Courtès authored 12 years ago

Conflicts:
	build-aux/download.scm
	distro/packages/autotools.scm
	distro/packages/base.scm
	distro/packages/bootstrap.scm
	distro/packages/lsh.scm
	distro/packages/make-bootstrap.scm
	distro/packages/ncurses.scm
	distro/packages/perl.scm
	tests/derivations.scm
	tests/union.scm

4050e5d6

History

Merge branch 'master' into core-updates

Ludovic Courtès authored 12 years ago

Conflicts:
	build-aux/download.scm
	distro/packages/autotools.scm
	distro/packages/base.scm
	distro/packages/bootstrap.scm
	distro/packages/lsh.scm
	distro/packages/make-bootstrap.scm
	distro/packages/ncurses.scm
	distro/packages/perl.scm
	tests/derivations.scm
	tests/union.scm

Code owners

Assign users and groups as approvers for specific file changes. Learn more.