diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
| commit | 1fafdadaae260eaef7194102b5eb842466e63dd1 (patch) | |
| tree | 734ab5c097f5a2ed36c2a7049d44f9c2bb46dede /testing/networkmanager-pptp | |
| parent | 1f52af629b1911ab027ef9c5d4d5903b48792050 (diff) | |
| parent | 6dab5c46b00f624c7900ff6d11b75bcafbe251d0 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unpaper/PKGBUILD
community/virtualbox/PKGBUILD
core/crda/PKGBUILD
core/eventlog/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'testing/networkmanager-pptp')
0 files changed, 0 insertions, 0 deletions