diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-13 10:43:29 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-13 10:43:29 +0200 |
| commit | 435c057e31699c734b0aabb46c2d9a4f647f1367 (patch) | |
| tree | ef2aff16463c36475e3e39c59f27a4c4fa94303c /extra/sane/saned.socket | |
| parent | 4e93709c6f760c133cf59fe25e8a3b81e6326d0f (diff) | |
| parent | 66cb4a487ad73063c6b000279a5d5558fb7603f5 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/espeakup/PKGBUILD
community/lxnm/PKGBUILD
community/notmuch/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/python2-numexpr/PKGBUILD
core/systemd/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/fakechroot/PKGBUILD
extra/fsarchiver/PKGBUILD
extra/gifsicle/PKGBUILD
extra/i8kutils/PKGBUILD
extra/msmtp/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
Diffstat (limited to 'extra/sane/saned.socket')
0 files changed, 0 insertions, 0 deletions