diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
| commit | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (patch) | |
| tree | 227eed66652cffc0e872b75e7fe601cb23214cdb /extra/networkmanager-pptp | |
| parent | 394988e4c3a3ab21e5d79481ac3f3295045af987 (diff) | |
| parent | 7ff5465d0386f06bea97ef956397c305d6f7e07f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/smalltalk/PKGBUILD
extra/crypto++/PKGBUILD
extra/libpciaccess/PKGBUILD
extra/postfix/PKGBUILD
extra/samba/PKGBUILD
extra/xorg-server/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
Diffstat (limited to 'extra/networkmanager-pptp')
0 files changed, 0 insertions, 0 deletions