diff options
author | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
---|---|---|
committer | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /emacs/.gitignore | |
parent | caf0ec0fb16b3f911d5d596766ee3048fe07fa66 (diff) | |
parent | 9ab70194a65f1d7ab726aaacdb43a58a02a048b6 (diff) | |
download | dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.tar.gz dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.zip |
Merge remote-tracking branch 'ryuslash/drd' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.emacs.d/init.el
.xinitrc
.zprofile
Makefile
xmonad/xmonad.hs
Diffstat (limited to 'emacs/.gitignore')
-rw-r--r-- | emacs/.gitignore | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/emacs/.gitignore b/emacs/.gitignore new file mode 100644 index 0000000..771231f --- /dev/null +++ b/emacs/.gitignore @@ -0,0 +1,16 @@ +tramp +elpa +bookmarks +abbrev_defs +custom.el +*.elc +ac-comphist.dat +auto-save-list/ +url/ +packages/ +newsticker/ +templates/ +rinit.* +!rinit.org +history +*.html |