diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-16 19:09:42 -0400 |
| commit | 1ff883371700757696efafefe266572776ac9558 (patch) | |
| tree | d2104f7f405f4fe7a8957e86f53300ee6d4b1aeb /.kde4 | |
| parent | 3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (diff) | |
| parent | 3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.login-daemons
Diffstat (limited to '.kde4')
| l--------- | .kde4/share/apps | 1 | ||||
| l--------- | .kde4/share/config | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.kde4/share/apps b/.kde4/share/apps new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/apps @@ -0,0 +1 @@ +../../.config
\ No newline at end of file diff --git a/.kde4/share/config b/.kde4/share/config new file mode 120000 index 0000000..7f8f949 --- /dev/null +++ b/.kde4/share/config @@ -0,0 +1 @@ +../../.config
\ No newline at end of file |