diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-30 11:55:09 +0200 |
| commit | b0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch) | |
| tree | 376cc5751d9a587815d7270caa61070f38832766 /extra/unison | |
| parent | 8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff) | |
| parent | 76ee9007095484a113d1856786b81e2d2fae8202 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/bmp-musepack/PKGBUILD
community/bmp-wma/PKGBUILD
community/bonnie++/PKGBUILD
community/cantata/PKGBUILD
community/checkinstall/PKGBUILD
community/chrootuid/PKGBUILD
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/compiz/PKGBUILD
community/compizconfig-backend-gconf/PKGBUILD
community/compizconfig-python/PKGBUILD
community/ekg2/PKGBUILD
community/emerald/PKGBUILD
community/fbgetty/PKGBUILD
community/flumotion/PKGBUILD
community/leafnode/PKGBUILD
community/libcompizconfig/PKGBUILD
community/libdnet/PKGBUILD
community/libee/PKGBUILD
community/libtxc_dxtn/PKGBUILD
community/linux-tools/PKGBUILD
community/openntpd/PKGBUILD
community/osiris/PKGBUILD
community/perl-package-stash-xs/PKGBUILD
community/perl-params-util/PKGBUILD
community/procstatd/PKGBUILD
community/scponly/PKGBUILD
community/sniffit/PKGBUILD
community/synergy/PKGBUILD
community/turbojpeg/PKGBUILD
community/unbound/PKGBUILD
community/uucp/PKGBUILD
core/gawk/PKGBUILD
core/ifenslave/PKGBUILD
core/jfsutils/PKGBUILD
core/openldap/PKGBUILD
core/rfkill/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
core/xinetd/PKGBUILD
extra/avahi/PKGBUILD
extra/calligra/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/flac/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libbluray/PKGBUILD
extra/libdmx/PKGBUILD
extra/libfs/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/libtiff/PKGBUILD
extra/libxau/PKGBUILD
extra/libxfixes/PKGBUILD
extra/licq/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/perl-guard/PKGBUILD
extra/perl-template-toolkit/PKGBUILD
extra/pidgin/PKGBUILD
extra/pigeonhole/PKGBUILD
extra/poppler/PKGBUILD
extra/postgresql/PKGBUILD
extra/python-geoip/PKGBUILD
extra/python/PKGBUILD
extra/samba/PKGBUILD
extra/sqlite/PKGBUILD
extra/vde2/PKGBUILD
extra/vim/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-dict/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/xscreensaver-libre/PKGBUILD
Diffstat (limited to 'extra/unison')
0 files changed, 0 insertions, 0 deletions