diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
| commit | 8878de8508ef59fe63f2d19a258a383ba09b10a8 (patch) | |
| tree | 9c5bf862464d4d4c2dae393189065a2615fa260e /community/prosody/ChangeLog | |
| parent | 0fccb862cc0ea09fc8a76c29babfdcef823d9ab7 (diff) | |
| parent | 0d51c533d75a26daabeb9e7b9c5dcfb211498a4d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libfm/PKGBUILD
community/lxlauncher/PKGBUILD
community/mrtg/PKGBUILD
core/glib2/PKGBUILD
extra/epiphany/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
Diffstat (limited to 'community/prosody/ChangeLog')
0 files changed, 0 insertions, 0 deletions