diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-10-26 20:41:42 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-10-26 20:41:42 +0200 |
| commit | c2627b56ac18e820b899bcfcc68534f98dcf4e78 (patch) | |
| tree | 6c0e057526afe7067eb86a99da7c496ef9bb81b6 /Makefile | |
| parent | 397de391221a9a284a4067e2202c35b8b700d981 (diff) | |
| parent | e03bffeef51451d0f416dce887ca7565a9b6ac62 (diff) | |
Merge branch 'master' of ssh://jrwb.de/dotfiles
Conflicts:
bashrc
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions