diff options
| author |  Tom Willemsen | 2012-02-24 00:22:49 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-02-24 00:22:49 +0100 |
| commit | f1532bd57803c201ec0ca23f169c74d9234c1bd7 (patch) | |
| tree | 78196393b47724c6f5726c60e1154c15e57140d8 /.config | |
| parent | 4857418dbde4c11f34a66774c5fb047119a96fe2 (diff) | |
| parent | 136e988c22fdd0e846b785b9f229e7d6263ec1da (diff) | |
| download | dotfiles-f1532bd57803c201ec0ca23f169c74d9234c1bd7.tar.gz dotfiles-f1532bd57803c201ec0ca23f169c74d9234c1bd7.zip | |
Merge remote-tracking branch 'gitorious/master' into phoenix
Diffstat (limited to '.config')
| -rw-r--r-- | .config/.gitignore | 2 | ||||
| -rw-r--r-- | .config/fish/.gitignore | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.config/.gitignore b/.config/.gitignore index 111aa05..c65bc94 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -1,4 +1,4 @@ -.libreoffice/ +*libreoffice/ Empathy/ GnuDiary/ Trolltech.conf diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore new file mode 100644 index 0000000..606b774 --- /dev/null +++ b/.config/fish/.gitignore @@ -0,0 +1 @@ +fishd.cloud |