Merge branch 'master' of metalzone:etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Sun, 4 Oct 2009 23:15:03 +0000 (00:15 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 4 Oct 2009 23:15:03 +0000 (00:15 +0100)
commitbe2cc788c85f818214bbcd3089eb2f481dd8b831
tree3b17f33e4e5708272caf61ed89334ff69bd066b2
parent99fe6ef5f1b75f8d040e36e7050ec5623d6318b8
parent918e99b0cfe5655bae0f4fea77838b3f857712e7
Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/bash_profile: Make OpenOffice not use ugly widgets.
  dot/gnus.el: Use distinct article buffers for different groups.
  dot/e16-bindings: Make 5-F6 toggle keyboard mouse control.
  dot/emacs, el/dot-emacs.el: Reformat in line with current styles.

Conflicts:
el/dot-emacs.el: Style hacking conflicted with Python fixing
dot/e16-bindings
dot/emacs
el/dot-emacs.el