Ludovic Courtès 81eec00cb2 Merge branch 'master' into core-updates ... Conflicts: Makefile.am guix/scripts/gc.scm guix/scripts/package.scm guix/ui.scm tests/guix-package.sh		2013-03-04 23:27:24 +01:00
..
download.scm	download: Adjust to `http-get*' deprecation.	2013-02-27 20:55:41 +01:00
gnu-build-system.scm	guix: build: Add "share/pkgconfig" to PKG_CONFIG_PATH, as used by xorg.	2013-03-04 10:14:34 +01:00
perl-build-system.scm	Add (guix build-system perl).	2013-03-04 00:48:00 +01:00
union.scm	union: Don't warn when colliding leaves point to the same file.	2013-02-06 23:04:10 +01:00
utils.scm	Patch-shebang: Do not add space after interpreter without argument.	2013-02-23 23:27:46 +01:00