summaryrefslogtreecommitdiff
path: root/community/scite/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-14 17:12:15 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-14 17:12:15 +0200
commit6feb300093e37e58027d52ca5734624565e09598 (patch)
tree418d2cc8c7e631c42898a28731ade8a29e3cb955 /community/scite/PKGBUILD
parent216722b262c18f99fa53875247e7a258cb3b4b34 (diff)
parentd3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/openbox/PKGBUILD community/powertop/PKGBUILD core/libusb-compat/PKGBUILD core/openssl/PKGBUILD extra/libvpx/PKGBUILD extra/php-apc/PKGBUILD extra/pidgin/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject/PKGBUILD extra/xfce4-genmon-plugin/PKGBUILD extra/xorg-server/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-cairo/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/wine/PKGBUILD testing/mdadm/PKGBUILD testing/php/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-server/git-fixes.patch
Diffstat (limited to 'community/scite/PKGBUILD')
0 files changed, 0 insertions, 0 deletions