diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
| commit | bc864260b40f40e8f689788c54f6138007764077 (patch) | |
| tree | 9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /community/trickle/PKGBUILD | |
| parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) | |
| parent | 453f3b8b2c568e9babcdc4852772278a39f130c0 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/drbd/PKGBUILD
community/etherape/PKGBUILD
community/ext4magic/PKGBUILD
community/fcron/PKGBUILD
community/fcron/systab.orig
community/gnome-panel/PKGBUILD
community/libident/PKGBUILD
community/libtorrent/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/usbipd.service
community/makedev/PKGBUILD
community/minbif/PKGBUILD
community/noip/PKGBUILD
community/notmuch/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/pound/PKGBUILD
community/preload/PKGBUILD
community/python-cchardet/PKGBUILD
community/rtorrent/PKGBUILD
community/tor/PKGBUILD
community/ude/PKGBUILD
core/openldap/PKGBUILD
core/sysvinit/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cvs/PKGBUILD
extra/epiphany-extensions/PKGBUILD
extra/fbset/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/gtkmm/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libical/PKGBUILD
extra/mutt/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/ossp/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/rtkit/PKGBUILD
extra/samba/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/liferea-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'community/trickle/PKGBUILD')
0 files changed, 0 insertions, 0 deletions