Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2016-07-15 14:00:51 -07:00
commit 2eb00a22e4
2 changed files with 28 additions and 27 deletions

2
.gitignore vendored
View File

@ -7,6 +7,8 @@
/dotfiles/boot/cache /dotfiles/boot/cache
/dotfiles/cider/.cache/ /dotfiles/cider/.cache/
/dotfiles/config/Trolltech.conf /dotfiles/config/Trolltech.conf
/dotfiles/config/browser-launcher2
/dotfiles/config/configstore
/dotfiles/config/dconf/ /dotfiles/config/dconf/
/dotfiles/config/google-chrome /dotfiles/config/google-chrome
/dotfiles/config/gtk-2.0/ /dotfiles/config/gtk-2.0/

View File

@ -1,5 +1,28 @@
# Compiled Python files # emacs
.emacs.desktop
.emacs*
projectile.cache
projectile-bookmarks.eld
.dir-locals.el
# Python
*.pyc *.pyc
.ropeproject/
dotfiles/pip/cache
# Clojure
.cljs_rhino_repl
# CTags
TAGS
# Vim
*.sw*
*.tmp*
# JavaScript
.tern-project
.tern-port
# Folder view configuration files # Folder view configuration files
.DS_Store .DS_Store
@ -9,30 +32,6 @@ Desktop.ini
._* ._*
Thumbs.db Thumbs.db
# Files that might appear on external disks # OSX
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes
.emacs.desktop
.emacs*
# yelp
TAGS
.ropeproject/
*.sw*
*.tmp*
projectile.cache
projectile-bookmarks.eld
dotfiles/pip/cache
.tern-project
.tern-port
dotfiles/config/configstore/
dotfiles/config/browser-launcher2/
dotfiles/pip/pip.log
.dir-locals.el
testing.restclient
*.log