diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-02 15:48:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-02 15:48:44 +0200 |
| commit | 72658c2308ab6c5ec52a590f6c7b9a2b389b7f29 (patch) | |
| tree | b949e009e881cbc19e64debea1068c56952b4b44 /extra/evolution-data-server/PKGBUILD | |
| parent | 04770005a02cc2a41550a57143af22c9d951bf6f (diff) | |
| parent | f003ac1c96d76f4e3a2b93f988e1effce6771052 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/tp_smapi/PKGBUILD
community/fish/PKGBUILD
community/supertux/PKGBUILD
extra/gvfs/PKGBUILD
multilib/wine/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iptables/PKGBUILD
testing/krb5/PKGBUILD
testing/lm_sensors/PKGBUILD
testing/lm_sensors/healthd
testing/lm_sensors/healthd.rc
Diffstat (limited to 'extra/evolution-data-server/PKGBUILD')
0 files changed, 0 insertions, 0 deletions