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

..

base32.scm

Update license headers.

2013-01-06 00:47:50 +01:00

build-utils.scm

Update license headers.

2013-01-06 00:47:50 +01:00

builders.scm

Update license headers.

2013-01-06 00:47:50 +01:00

derivations.scm

Merge branch 'master' into core-updates

2013-01-06 17:33:02 +01:00

guix-build.sh

Update license headers.

2013-01-06 00:47:50 +01:00

guix-daemon.sh

Update license headers.

2013-01-06 00:47:50 +01:00

guix-download.sh

Update license headers.

2013-01-06 00:47:50 +01:00

guix-gc.sh

Update license headers.

2013-01-06 00:47:50 +01:00

guix-package.sh

Update license headers.

2013-01-06 00:47:50 +01:00

packages.scm

Update license headers.

2013-01-06 00:47:50 +01:00

snix.scm

Update license headers.

2013-01-06 00:47:50 +01:00

store.scm

Update license headers.

2013-01-06 00:47:50 +01:00

test.drv

Add unit test for derivation parsing and output.

2012-04-19 23:09:55 +02:00

union.scm

Merge branch 'master' into core-updates

2013-01-06 17:33:02 +01:00

utils.scm

Update license headers.

2013-01-06 00:47:50 +01:00