projects / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5427e9a b89f957)
Merge branch 'master' into light-emacs
authorOlivier Tétard <otd@otd.amossys.fr>
Wed, 26 Aug 2009 08:10:48 +0000 (10:10 +0200)
committerOlivier Tétard <otd@otd.amossys.fr>
Wed, 26 Aug 2009 08:10:48 +0000 (10:10 +0200)
Conflicts:
emacs/emacs.el


Trivial merge
Dotfiles