chiark / gitweb /
~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e613fc7 8584cc9)
Merge remote-tracking branch 'staging'
authorMark Wooding <mdw@distorted.org.uk>
Wed, 11 May 2016 19:25:02 +0000 (20:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 11 May 2016 19:25:02 +0000 (20:25 +0100)
* staging:
  dot/xinitrc: Correct geometry if the Lucid build of Emacs 24 is found.
  dot/emacs: Configure transient-mark-mode sensibly for later Emacsen.

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

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