Ludovic Courtès
a9db7d10b6
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/autotools.scm
gnu/packages/guile.scm
gnu/packages/python.scm
gnu/packages/shishi.scm
guix/gnu-maintenance.scm
guix/scripts/build.scm
guix/scripts/gc.scm
guix/scripts/package.scm
guix/scripts/substitute-binary.scm
guix/ui.scm
nix/nix-daemon/guix-daemon.cc
test-env.in
tests/nar.scm
tests/store.scm
2013-04-26 16:43:08 +02:00
..
2013-02-01 13:16:45 +01:00
2013-02-01 13:16:45 +01:00
2013-04-11 22:56:39 +02:00
2013-04-17 00:08:21 +02:00
2013-02-16 22:17:37 -05:00
2013-02-16 22:17:37 -05:00
2013-02-16 22:17:37 -05:00
2013-02-27 23:16:00 +01:00
2013-04-18 16:08:43 +00:00
2013-04-12 21:58:47 +02:00
2013-04-26 16:43:08 +02:00
2013-02-01 13:16:45 +01:00
2013-04-15 23:42:55 +02:00
2012-04-19 23:09:55 +02:00
2013-02-01 13:16:41 +01:00
2013-02-06 23:04:10 +01:00
2013-04-14 16:56:08 +02:00