~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9adf684 ee7c3de)
Merge remote-tracking branch 'staging'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 24 Feb 2014 19:51:13 +0000 (19:51 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 24 Feb 2014 19:51:13 +0000 (19:51 +0000)
* staging:
  dot/emacs, el/dot-emacs.el: Introduce support for Scala.
  el/dot-emacs.el: New face `mdw-trivial-face'.


Trivial merge
Dotfiles and other configuration.