chiark / gitweb /
~mdw / profile / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dbd0e1f 89bd451)
Merge branch 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Sun, 14 Dec 2008 19:05:45 +0000 (19:05 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 14 Dec 2008 19:05:45 +0000 (19:05 +0000)
commite603f932673f2ed660e60ca479a8e2ae8b31ee21
tree8ebb05750babd600e7bc3f00ab224f9869c486dftree | snapshot
parentdbd0e1f05933462a7f1ce8eb798f60b4a3b629e7commit | diff
parent89bd45165660298a8793b66f8712a7ba1cefd23dcommit | diff
Merge branch 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile:
  e16-config: Remove.
  xinitrc and friends: Embed prompt-and-run functionality in xinitrc.
  gitconfig: Use magical hacked 6x13 font.
  fonts.conf: New configuration file.

Conflicts:

e16-bindings
e16-bindings diff1 | diff2 | blob | history
Dotfiles and other configuration.