diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
| commit | d5acc51bdb801d2bb930af53220946e739dd5edd (patch) | |
| tree | ca90bf81203766e39c0f656cf371135530092422 /extra/kino | |
| parent | 1c2a0b0ad198c54e908452121ed1ab42e7d50809 (diff) | |
| parent | 2493f16093b14a81e949bd6a1b89724cb931807d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/xemacs/PKGBUILD
community/gkrellm/PKGBUILD
community/ldns/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/unbound/PKGBUILD
staging/kdelibs/PKGBUILD
staging/opencv/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/kino')
0 files changed, 0 insertions, 0 deletions