diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-05-23 09:43:12 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-05-23 09:43:12 +0800 |
| commit | 86a81222cad9841c67e9d9bcd46c567383e9a34f (patch) | |
| tree | d976896cba87c5de65d8fdc4bf0be85880c04153 /.gitignore | |
| parent | 3e3d47fc5347a5032fd2039831be1dc1d80576ed (diff) | |
| parent | 8605321dd6f3c42590046be9d69112a8c8cf7cbf (diff) | |
| download | patches-86a81222cad9841c67e9d9bcd46c567383e9a34f.tar patches-86a81222cad9841c67e9d9bcd46c567383e9a34f.tar.gz | |
Merge branch 'master' into gtk-rebuild
Conflicts:
gnu/packages/gtk.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3ec36366e3..47cb39584e 100644 --- a/.gitignore +++ b/.gitignore @@ -96,7 +96,7 @@ stamp-h[0-9] /doc/guix.tp /doc/guix.vr /doc/guix.vrs -/nix/scripts/substitute-binary +/nix/scripts/substitute /doc/images/bootstrap-graph.png /doc/images/bootstrap-graph.eps /guix-register @@ -112,3 +112,5 @@ GTAGS /emacs/guix-helper.scm /emacs/guix-init.el /emacs/guix-profiles.el +/doc/os-config-bare-bones.texi +/doc/os-config-desktop.texi |