guix-devel/guix/build-system
Ludovic Courtès 4050e5d6cf Merge branch 'master' into core-updates
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
2013-01-06 17:33:02 +01:00
..
gnu.scm Merge branch 'master' into core-updates 2013-01-06 17:33:02 +01:00
trivial.scm Update license headers. 2013-01-06 00:47:50 +01:00