diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-27 10:01:41 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-27 10:01:41 +0200 |
commit | 05a30322235744d8826965c277e9addef8bd7650 (patch) | |
tree | 3dc2d021e9e085ba34e12c8778fe7ca35e9ee612 /extra/telepathy-kde-text-ui | |
parent | 8f88428db7509e434696538e7c757392400d178b (diff) | |
parent | a27a6af53095da314eca1d33911f72775dfc2bce (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libparserutils/PKGBUILD
extra/kdevplatform/PKGBUILD
extra/libfontenc/PKGBUILD
Diffstat (limited to 'extra/telepathy-kde-text-ui')
0 files changed, 0 insertions, 0 deletions