diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
| commit | b2bfa32d253337a48f3bc0260982cbb945b345a3 (patch) | |
| tree | a75ae018b5c7608414bf50bd6e55683eb0c44f7a /.gitignore | |
| parent | 99662b8dbf420d0112f83b7daddcecfb1bcb9bad (diff) | |
| parent | 2096ef47aad57a9988c8fdfaa46a70770a0e0b12 (diff) | |
| download | guix-b2bfa32d253337a48f3bc0260982cbb945b345a3.tar guix-b2bfa32d253337a48f3bc0260982cbb945b345a3.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 10b18daa5e..7cc6751c7e 100644 --- a/.gitignore +++ b/.gitignore @@ -46,8 +46,8 @@ config.cache /doc/guix.pdf /doc/stamp-vti /doc/version.texi -/gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz -/gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz +/gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz +/gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz /gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz /guix/config.scm /nix/nix-daemon/nix-daemon.cc |