summaryrefslogtreecommitdiff
path: root/i3/config.working
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-04-27 10:40:17 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-04-27 10:40:17 +0100
commit0ba711000cf3c31a94546ecc64d94c1303360084 (patch)
tree6fc83d36bb7df6351a24ebc4104055cc69b52dbd /i3/config.working
parentdbd95f31c1716b8a53e7dc64419b8cadcac01434 (diff)
parent6368ab2e44035924e39c0fbf8509346eedbe19bf (diff)
Merge branch 'master' of github.com:uvaes/dotfiles
Conflicts: tmuxlinerc
Diffstat (limited to 'i3/config.working')
0 files changed, 0 insertions, 0 deletions