diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-29 11:08:24 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-29 11:08:24 +0100 |
| commit | bf57d1e5a2a6f53ec61f15f32571940a9eb56ac7 (patch) | |
| tree | b38e9c719501ca5196d4d7911cdef911c2fff54b /extra/proftpd | |
| parent | 7d9481bb12f77bde4df2e923b4e932773b8d74f9 (diff) | |
| parent | 2cb7f65fb24926493d457f6931e421e27aa629da (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/fcron/PKGBUILD
community/glob2/PKGBUILD
community/gnash/PKGBUILD
core/file/PKGBUILD
core/findutils/PKGBUILD
core/texinfo/PKGBUILD
core/which/PKGBUILD
extra/boost/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/samba/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'extra/proftpd')
0 files changed, 0 insertions, 0 deletions