diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2011-12-03 23:19:24 +0000 |
|---|---|---|
| committer | Fabian Affolter <fabian@affolter-engineering.ch> | 2011-12-03 23:19:24 +0000 |
| commit | d7e247edada49e3fed76e91c09c115dfe7a8c0ec (patch) | |
| tree | 428eedb75c4cb2bc63edd1c06cc00592443c5fb6 /testing/evolution-data-server | |
| parent | 698a14e8bd602a37174f1e364c0771affda83242 (diff) | |
| parent | 91b82f8bcaadc13e38b62760f18ff9e4b22e9896 (diff) | |
| download | aports-d7e247edada49e3fed76e91c09c115dfe7a8c0ec.tar.bz2 aports-d7e247edada49e3fed76e91c09c115dfe7a8c0ec.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Conflicts:
main/mr/APKBUILD
testing/flawfinder/APKBUILD
testing/libewf/APKBUILD
testing/nebula/APKBUILD
testing/netdiscover/APKBUILD
testing/pcapy/APKBUILD
testing/py-libacl/APKBUILD
testing/wput/APKBUILD
Diffstat (limited to 'testing/evolution-data-server')
0 files changed, 0 insertions, 0 deletions