diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-23 08:46:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-23 08:46:56 +0100 |
| commit | be8b4f05bd396634d6e9e7328da718f3a96048a6 (patch) | |
| tree | c9e82423ec5c72d3bec10e6ddb9209094db14d59 /testing/inetutils/ftpd.conf | |
| parent | 30ffb98098a280f778d7361817ee2a860c868a1b (diff) | |
| parent | a42cd7aaabfdb3ecc0a538548e8dbcc7ca860b2d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/drbd/PKGBUILD
extra/cfitsio/PKGBUILD
extra/gstreamer/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'testing/inetutils/ftpd.conf')
0 files changed, 0 insertions, 0 deletions