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)
commit9865e424ffb61f8a345080fe92213d4bab807c6e
treeb8bcb72749f274ee408ab6d9fbcfca6326c982c0
parentc24a0acd7dc429debf946dfbef5e81bbaa7184c0
parentfb690b648c7bf35fa04b117f7963278f0c279df2
Merge branch 'master' of us:etc/profile

* '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.
dot/emacs