diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-24 09:10:15 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-24 09:10:15 +0100 |
| commit | 0a91993304168ce808fbb7eca986e03262ccb692 (patch) | |
| tree | b8a47673b339f0f718625cf189b75e1dff7fe737 /~xihh | |
| parent | be8b4f05bd396634d6e9e7328da718f3a96048a6 (diff) | |
| parent | 31416859638d756d88136e4e0eb78027c16ac17f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libpinyin/PKGBUILD
extra/calligra/PKGBUILD
extra/evas_generic_loaders/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/nx/PKGBUILD
extra/poppler/PKGBUILD
extra/usermin/PKGBUILD
extra/vigra/PKGBUILD
extra/webmin/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to '~xihh')
0 files changed, 0 insertions, 0 deletions