diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-19 09:54:35 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-19 09:54:35 +0200 |
| commit | 3c8f9aba21e3ac85376497cc12d67fd8f34c0839 (patch) | |
| tree | 087ffae170ab2cdc6b4424179493869dbe1405d0 /extra/telepathy-kde-call-ui | |
| parent | b93deb686e23603e67eee07fced30237db47c367 (diff) | |
| parent | e4afcc505c31482d7d7cee60bb6388bfacc8ad7f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/oss/PKGBUILD
staging/kdebase-workspace/PKGBUILD
Diffstat (limited to 'extra/telepathy-kde-call-ui')
0 files changed, 0 insertions, 0 deletions