diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 13:39:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 13:39:33 -0400 |
| commit | 36e34f397b00ad39e21edcd7c91704b1ee454290 (patch) | |
| tree | 91284d3843e133535d17255cca93ab38c0138fa6 /.local/bin/pick | |
| parent | 36e3771194274c4dd6358c7d1986ef18ca71677c (diff) | |
| parent | f6742e8302f615b75eb6a2dd4faf3b306be56012 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/login.sh
.config/wmii-hg/autostart
Diffstat (limited to '.local/bin/pick')
0 files changed, 0 insertions, 0 deletions