summaryrefslogtreecommitdiff
path: root/extra/evolution-data-server
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-04 12:13:12 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-04 12:13:12 -0300
commit2d71292ee6ddd4970f593975fd652be1d820f92c (patch)
tree82377d0e84fc4a0a04066d4733dae49484a5225a /extra/evolution-data-server
parentd734cc3a77cdc6960cbd72f3f8c680612342f24d (diff)
parent067b127a853780b2b4ae7236dcdaaf72396dfa86 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: libre/icecat/PKGBUILD multilib/lib32-v4l-utils/PKGBUILD multilib/nspluginwrapper/PKGBUILD testing/libreoffice/PKGBUILD
Diffstat (limited to 'extra/evolution-data-server')
0 files changed, 0 insertions, 0 deletions