chiark / gitweb /
Merge branch 'master' of ustrat:git/staging/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 12 May 2017 13:29:56 +0000 (14:29 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 12 May 2017 13:29:56 +0000 (14:29 +0100)
commit3cad7c5edf8793c33308d91c123151a7e4653253
tree6c8e6c822658784b315e11feafc1f7fa02ee42f7
parent3feef411b5486ffdb5384387db94ea3664117933
parentc5376a5b50ceb092c453980a27d47c035aa96489
Merge branch 'master' of ustrat:git/staging/profile

* 'master' of ustrat:git/staging/profile:
  dot/emacs: Bind C-c k to `compile'.
  bin/xpra-start-xdummy: Give a relative path to the configuration file.