diff options
| author | David Runge <dave@sleepmap.de> | 2015-03-11 18:50:47 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-03-11 18:50:47 +0100 |
| commit | 378c9f89e43d135f6b8c7ae263643441d1193758 (patch) | |
| tree | 186d216eab682164d82f5c466e769ee9bf8c1726 /bin/tmux-mem-cpu-load | |
| parent | 78d47f7aca8e4f47c0d6714a7cb0095ff1975e07 (diff) | |
| parent | c377702f4c9cb27df06ae534c185ed25ab9c6262 (diff) | |
| download | dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.gz dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.bz2 dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.xz dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.zip | |
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles:
.irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
.gitignore: Adding some now unneeded stuff that will popup from time to time.
.zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
.irssi: Updating .irssi submodule to latest commit.
.vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
.vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
.tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
.compton.conf: Adding MPlayer to comptons exclude lists.
Updating irssi settings.
Diffstat (limited to 'bin/tmux-mem-cpu-load')
0 files changed, 0 insertions, 0 deletions