diff options
| author |  Tom Willemsen | 2012-05-22 14:36:52 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-05-22 14:36:52 +0000 |
| commit | 90cccbae8af88ec5431d4c24939e0c61cf2aec2d (patch) | |
| tree | 1e2666d09616a31441ebda2fda416b0292f364e7 /pictures/wallpapers | |
| parent | df1105ec767afa06318db9e1ec2d5de0d737df44 (diff) | |
| parent | 1ea643146c817681ce8d4acd8726a1fd113a05ba (diff) | |
| download | dotfiles-90cccbae8af88ec5431d4c24939e0c61cf2aec2d.tar.gz dotfiles-90cccbae8af88ec5431d4c24939e0c61cf2aec2d.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.xbindkeysrc.scm
.xinitrc
Diffstat (limited to 'pictures/wallpapers')
0 files changed, 0 insertions, 0 deletions