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 /.linphonerc | |
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 '.linphonerc')
l--------- | .linphonerc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.linphonerc b/.linphonerc new file mode 120000 index 0000000..aa45b66 --- /dev/null +++ b/.linphonerc @@ -0,0 +1 @@ +.config/linphonerc
\ No newline at end of file |