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 /.kde4 | |
| 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 '.kde4')
| l--------- | .kde4 | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -.kde
\ No newline at end of file +.kde/
\ No newline at end of file |