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 /.kde | |
| 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 '.kde')
| -rw-r--r-- | .kde/.gitignore | 1 | ||||
| l--------- | .kde/share/apps | 2 | ||||
| l--------- | .kde/share/config | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.kde/.gitignore b/.kde/.gitignore new file mode 100644 index 0000000..3e3f239 --- /dev/null +++ b/.kde/.gitignore @@ -0,0 +1 @@ +socket-*
\ No newline at end of file diff --git a/.kde/share/apps b/.kde/share/apps index 7f8f949..231b1b5 120000 --- a/.kde/share/apps +++ b/.kde/share/apps @@ -1 +1 @@ -../../.config
\ No newline at end of file +../../.config/
\ No newline at end of file diff --git a/.kde/share/config b/.kde/share/config index 7f8f949..231b1b5 120000 --- a/.kde/share/config +++ b/.kde/share/config @@ -1 +1 @@ -../../.config
\ No newline at end of file +../../.config/
\ No newline at end of file |