diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2012-01-19 23:04:56 +0000 |
|---|---|---|
| committer | Fabian Affolter <fabian@affolter-engineering.ch> | 2012-01-19 23:04:56 +0000 |
| commit | 69098f7985c6a87180dfb6dff8bc42712093af94 (patch) | |
| tree | 4192416a5e95fd0b92cef9635a7090b9a932d157 /testing/evolution-data-server | |
| parent | cff52449dc5a0e24f4103c20f6a4e5c7ad55ec30 (diff) | |
| parent | 41329347c2a22370231bcc8fe581fbddf035e15c (diff) | |
| download | aports-69098f7985c6a87180dfb6dff8bc42712093af94.tar.bz2 aports-69098f7985c6a87180dfb6dff8bc42712093af94.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Conflicts:
main/gnutls/APKBUILD
testing/cowpatty/APKBUILD
testing/libgsasl/APKBUILD
testing/libgss/APKBUILD
testing/loudmouth/APKBUILD
testing/ms-sys/APKBUILD
Diffstat (limited to 'testing/evolution-data-server')
0 files changed, 0 insertions, 0 deletions