diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
| commit | 786fcda41a731654dd2de7496d5f28bc7bb19743 (patch) | |
| tree | ab557aa22a6463fd15667ec738b12f7fd78d7aa1 /.ssh | |
| parent | 614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff) | |
| parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) | |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.kde/share/apps
.kde/share/config
.kde4
Diffstat (limited to '.ssh')
| -rw-r--r-- | .ssh/config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.ssh/config b/.ssh/config index 5c271b5..63519e1 100644 --- a/.ssh/config +++ b/.ssh/config @@ -9,3 +9,7 @@ Host parabola Port 1863 HostName repo.parabolagnulinux.org User repo + +Host lore + HostName lore.cs.purdue.edu + User shumakl |