diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
| commit | b68ce750ac90da4fb88669d256666dbaa39f4338 (patch) | |
| tree | cabf50b7a85d1062ba60bd3ebf45fb17965884ca /.config/gpg | |
| parent | 15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff) | |
| parent | 34bbf66a460e5c622e209211869b3a8bde8a68d5 (diff) | |
Merge remote-tracking branch 'origin/gluglugt60-par' into build64-par
Conflicts:
.config/login.sh
.config/lxpanel/default/config
.config/wmii-hg/config.sh
Diffstat (limited to '.config/gpg')
0 files changed, 0 insertions, 0 deletions