diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-05 10:04:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-05 10:04:45 -0300 |
| commit | 1d7654844d03a315c45e204abf8fa44f4d750bba (patch) | |
| tree | 3a009f4ec4921e4d62428d0f3da4169380dd8f7e /extra/system-config-printer | |
| parent | b6c59f3d5bcae3f0b61856c1bea145c25c02a6f7 (diff) | |
| parent | 777466db27694f0cad10a7159ba66f2a2b39a516 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
gnome-unstable/folks/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
gnome-unstable/telepathy-mission-control/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
testing/iputils/PKGBUILD
testing/iputils/iputils.install
testing/ypserv/PKGBUILD
Diffstat (limited to 'extra/system-config-printer')
0 files changed, 0 insertions, 0 deletions