diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-04 10:03:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-04 10:03:29 +0100 |
| commit | 188c20297098b706ee2687fe404b0c63eb2600d9 (patch) | |
| tree | 069c4fab3fe7423afdcc360ffeba09900c66a00c /libre/cups-libre/cups.install | |
| parent | f104a5865e580d1a5c50f83b6bfac2885f065c92 (diff) | |
| parent | 2030e810a5cfd4d3ff6e0f8930560c96f2990eb2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrypt/PKGBUILD
community/mathomatic/PKGBUILD
community/tuxpaint/PKGBUILD
extra/aisleriot/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-applets/PKGBUILD
extra/gnome-shell/PKGBUILD
extra/xdg-user-dirs-gtk/PKGBUILD
Diffstat (limited to 'libre/cups-libre/cups.install')
0 files changed, 0 insertions, 0 deletions