diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-28 09:49:21 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-28 09:49:21 +0200 |
| commit | 937cae774d2b744fe7e00f250bd9d9333358a6ad (patch) | |
| tree | 3efee602086bae79708af013fe47a855439ff538 /core/libsasl | |
| parent | bc23d831a86d6c4fee7da37fc1b8e677ab4e231d (diff) | |
| parent | ad4cbb616af1b40790c6533f1d5b98dbd7aaa199 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/systemd/PKGBUILD
extra/dbus-glib/PKGBUILD
extra/samba/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
Diffstat (limited to 'core/libsasl')
0 files changed, 0 insertions, 0 deletions