~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c24a0ac fb690b6)
Merge branch 'master' of us:etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Sat, 30 Mar 2013 15:00:53 +0000 (15:00 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 30 Mar 2013 15:00:53 +0000 (15:00 +0000)
* 'master' of us:etc/profile:
  el/dot-emacs.el: Fix Magit highlighting in terminal windows.
  dot/emacs: Turn on `dired-x' when something starts `dired'.
  dot/xinitrc: Overhaul to support XFCE desktop.

1  2 
dot/emacs patch | diff1 | diff2 | blob | history

diff --cc dot/emacs
Simple merge
Dotfiles and other configuration.