Mark H Weaver 933204e5b1 Merge branch 'master' into core-updates ... Conflicts: gnu-system.am gnu/packages/gstreamer.scm		2015-04-17 09:54:11 -04:00
..
base32.scm
base64.scm
build-utils.scm
builders.scm
cpan.scm
derivations.scm
gexp.scm
gremlin.scm
guix-archive.sh
guix-authenticate.sh
guix-build.sh
guix-daemon.sh
guix-download.sh
guix-gc.sh
guix-hash.sh
guix-lint.sh
guix-package-net.sh
guix-package.sh
guix-register.sh
guix-system.sh
hackage.scm
hash.scm
lint.scm
monads.scm
nar.scm
packages.scm
pk-crypto.scm
pki.scm
profiles.scm
publish.scm
pypi.scm
records.scm
sets.scm
signing-key.pub
signing-key.sec
snix.scm
store.scm
substitute.scm
syscalls.scm
test.drv
ui.scm
union.scm
utils.scm