diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 22:29:52 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 22:29:52 -0300 |
commit | 258bafde6bf3c83e4108230457073e8136719a73 (patch) | |
tree | a6132a3a8316be50ff77e3cfcf5c41f94747bd2c /community/gphpedit | |
parent | 9b703cb6980ff009ca181cecd900cb2e78f5d54e (diff) | |
parent | f6a79a3f5989efc8db63af942851c56f0c462bb1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pigeonhole/PKGBUILD
community/pv/PKGBUILD
community/python-gnupginterface/PKGBUILD
community/tdl/PKGBUILD
extra/clisp/PKGBUILD
extra/expect/PKGBUILD
extra/gtkpod/PKGBUILD
extra/hspell/PKGBUILD
extra/id3lib/PKGBUILD
extra/imake/PKGBUILD
extra/libfontenc/PKGBUILD
extra/libice/PKGBUILD
extra/libsm/PKGBUILD
extra/libspectre/PKGBUILD
extra/libtasn1/PKGBUILD
extra/libxau/PKGBUILD
extra/libxaw/PKGBUILD
extra/libxxf86dga/PKGBUILD
extra/mp3splt/PKGBUILD
extra/multitail/PKGBUILD
extra/nss_ldap/PKGBUILD
extra/pam_ldap/PKGBUILD
extra/recode/PKGBUILD
extra/ruby/PKGBUILD
extra/squid/PKGBUILD
extra/ssmtp/PKGBUILD
extra/umfpack/PKGBUILD
extra/xorg-xbacklight/PKGBUILD
extra/xorg-xbiff/PKGBUILD
extra/xorg-xcalc/PKGBUILD
extra/xorg-xconsole/PKGBUILD
extra/xorg-xedit/PKGBUILD
extra/xorg-xeyes/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'community/gphpedit')
0 files changed, 0 insertions, 0 deletions