diff options
author | Tom Willemsen | 2012-04-19 09:48:26 +0000 |
---|---|---|
committer | Tom Willemsen | 2012-04-19 09:48:26 +0000 |
commit | 20181fab259a62623689adeda30a976fcc09aa0b (patch) | |
tree | 535bbc2d9551db4e31d6c681a36d4399dce67470 /.gitignore | |
parent | 853f43c483ed827a9ed39f9c37869967dc769fc6 (diff) | |
parent | ddc6bafa69cfb4bdc815156ecc7a0b8a21b11e7d (diff) | |
download | dotfiles-20181fab259a62623689adeda30a976fcc09aa0b.tar.gz dotfiles-20181fab259a62623689adeda30a976fcc09aa0b.zip |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.xinitrc
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -115,3 +115,6 @@ Mail/ .mu/ .org-timestamps/ .virtualenv/ +.PlaneShift/ +.android/ +.nv/ |