diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
| commit | cdbd7308d16cb249715cce9bedf8b809f2576804 (patch) | |
| tree | bfdb3a816cf96988dc788e2678acdb294b032811 /community-testing/privoxy/privoxy.service | |
| parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
| parent | 648599b08776ea788a3ddb0365eb30fda03efe7b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/dosbox/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fbgrab/PKGBUILD
community/fbv/PKGBUILD
community/flam3/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gdk-pixbuf/PKGBUILD
community/ghemical/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/gnustep-base/PKGBUILD
community/guvcview/PKGBUILD
community/keepassx/PKGBUILD
community/kvpnc/PKGBUILD
community/libghemical/PKGBUILD
community/liboglappth/PKGBUILD
community/png2ico/PKGBUILD
community/shapelib/PKGBUILD
community/sloccount/PKGBUILD
community/tmw/PKGBUILD
community/xmoto/PKGBUILD
core/links/PKGBUILD
extra/amule/PKGBUILD
extra/cairomm/PKGBUILD
extra/calligra/PKGBUILD
extra/evas/PKGBUILD
extra/fltk/PKGBUILD
extra/gd/PKGBUILD
extra/gif2png/PKGBUILD
extra/glhack/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/imlib/PKGBUILD
extra/imlib2/PKGBUILD
extra/lbreakout2/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/libkate/PKGBUILD
extra/libpano13/PKGBUILD
extra/libwebp/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxslt/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/ntp/PKGBUILD
extra/nx/PKGBUILD
extra/openjpeg/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtiplot/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/samba/PKGBUILD
extra/sdl_image/PKGBUILD
extra/vice/PKGBUILD
extra/vigra/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wv/PKGBUILD
extra/wxgtk/PKGBUILD
extra/xaos/PKGBUILD
extra/xsane/PKGBUILD
extra/zvbi/PKGBUILD
Diffstat (limited to 'community-testing/privoxy/privoxy.service')
0 files changed, 0 insertions, 0 deletions