diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-10 13:49:32 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-10 13:49:32 +0200 |
| commit | 09dea20d0ca4b034a72f66c2bb22caa976ce1f85 (patch) | |
| tree | 936d721a591ceb57c16d769ab0f755514879ed9b /libre/lilo | |
| parent | cdbd7308d16cb249715cce9bedf8b809f2576804 (diff) | |
| parent | fc7ee6f5a358c428577ae4e6217ff594a3e45ad3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gliv/PKGBUILD
community/yaml-cpp0.3/PKGBUILD
extra/ecore/PKGBUILD
extra/edje/PKGBUILD
extra/elementary/PKGBUILD
extra/embryo/PKGBUILD
extra/emotion/PKGBUILD
extra/ethumb/PKGBUILD
extra/kdepim/PKGBUILD
extra/php/PKGBUILD
extra/qtiplot/PKGBUILD
extra/xfce4-mixer/PKGBUILD
Diffstat (limited to 'libre/lilo')
0 files changed, 0 insertions, 0 deletions