diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
commit | fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch) | |
tree | d2b16d75c64d947545149f37bda7cdb8873a4770 /extra/pyxml/PKGBUILD | |
parent | 7823c9009a845174746fd0da09af46a138481851 (diff) | |
parent | 10aa61ef39e662453e1d817046e359372fe3b326 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-pl/PKGBUILD
community/gloox/PKGBUILD
community/libircclient/PKGBUILD
community/mashup/PKGBUILD
community/omniorb/PKGBUILD
community/openbox/PKGBUILD
community/patchutils/PKGBUILD
community/rxvt-unicode/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt5/PKGBUILD
extra/samba/PKGBUILD
extra/tdb/PKGBUILD
extra/transmission/PKGBUILD
extra/vim/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'extra/pyxml/PKGBUILD')
0 files changed, 0 insertions, 0 deletions